[llvm-commits] CVS: llvm/test/Regression/Reoptimizer/Makefile.mk

[Michael Brukman]

Changes in directory llvm/test/Regression/Reoptimizer:

Makefile.mk updated: 1.1 -> 1.2

---
Log message:

Fixed paths, eliminated unnecessary objects being linked in and kept around.


---
Diffs of the changes:

Index: llvm/test/Regression/Reoptimizer/Makefile.mk
diff -u llvm/test/Regression/Reoptimizer/Makefile.mk:1.1 llvm/test/Regression/Reoptimizer/Makefile.mk:1.2
--- llvm/test/Regression/Reoptimizer/Makefile.mk:1.1	Mon Oct 21 13:23:20 2002
+++ llvm/test/Regression/Reoptimizer/Makefile.mk	Mon Oct 21 18:56:53 2002
@@ -3,15 +3,10 @@
 # using Anand's path profiling/trace cache instrumentation
 
 # find the src and obj root directories
-#LEVEL := ../../../..
-#OBJ_ROOT := /localhome/$(USER)
-#LLVM_SRC = $(shell cd $(LEVEL); pwd)
-#LLVM_OBJ = $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(LLVM_SRC))
-
-# switch to Anand's source base...
-LLVM_SRC := /home/vadve/ashukla/cvs2/llvm
-LLVM_OBJ := /localhome/ashukla/cvs2/llvm
-
+LEVEL := ../../../..
+OBJ_ROOT := /localhome/$(USER)
+LLVM_SRC = $(shell cd $(LEVEL); pwd)
+LLVM_OBJ = $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(LLVM_SRC))
 LLVM_LIB := $(LLVM_OBJ)/lib/Debug
 
 # This lets us keep a single copy of Trigger.{s,o} in the common directory
@@ -44,20 +39,17 @@
 $(OUTS): $(OUTBC)
 	llc -f $(OUTBC)
 
-# Anand assures me this absolutely needs to be linked in
-RUNTIME   = /home/vadve/ashukla/runtime.o
-LIB_DEBUG = $(LLVM_OBJ)/lib/Debug
-OBJS = $(RUNTIME) $(TRIGGER_O) $(LIB_DEBUG)/tracecache.o $(LIB_DEBUG)/mapinfo.o 
-LIBS = -lbcreader -lvmcore -lsupport -ltransformutils -lprofpaths
+OBJS = $(TRIGGER_O) $(LLVM_LIB)/tracecache.o $(LLVM_LIB)/mapinfo.o 
+LIBS = -lbcreader -lvmcore -lsupport -lprofpaths -ltransformutils 
 
 $(OUTO): $(OUTS)
-	g++ $(GPROF) -c -L $(LIB_DEBUG) $(OUTS) -o $(OUTO) 
+	g++ $(GPROF) -c -L $(LLVM_LIB) $(OUTS) -o $(OUTO) 
 
 $(OUTR): $(OUTO) $(OBJS)
-	g++ $(GPROF) -L $(LIB_DEBUG) $(OUTO) -o $(OUTR) $(OBJS) $(LIBS)
+	g++ $(GPROF) -L $(LLVM_LIB) $(OUTO) -o $(OUTR) $(OBJS) $(LIBS)
 
 profile: $(OUTR)
-	env LD_LIBRARY_PATH=$(LLVM_LIB) ./$(OUTR)
+	tcsh -c "setenv LD_LIBRARY_PATH $(LLVM_LIB); ./$(OUTR); unsetenv LD_LIBRARY_PATH"
 	ggprof -c $(OUTR) > $(OUT_PROF)
 
 clean: