Eliminate opt library

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1516 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index 54f675c28c9a5aff57374ad17dd7b419697a4994..3e3f0b0d9e914790169dceedaeeac113d4f2edb0 100644 (file)
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = lli
-USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support \
+USEDLIBS = bcreader bcwriter vmcore asmwriter analysis support \
           target transforms
 TOOLLINKOPTS = -ldl
 
@@ -16,6 +16,6 @@ Debug/RuntimeLib.ll: Debug/RuntimeLib.c
        /home/vadve/lattner/cvs/gcc_install/bin/gcc $< -S -o $@
 
 $(LEVEL)/tools/Debug/RuntimeLib.bc: Debug/RuntimeLib.ll
-       ../Debug/gccas $< -o $@
+       LD_LIBRARY_PATH=../lib/Debug:/usr/dcs/software/evaluation/encap/gcc-3.0.2/lib/ ../Debug/gccas $< -o $@
 
 

diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index aab1c2f93e545048920c42e710bd35eeca38d479..065b093b5adf15c8b1d78c852bdef7c2021df535 100644 (file)
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = analyze
-USEDLIBS = opt analysis asmparser bcreader asmwriter vmcore analysis opt support
+USEDLIBS = analysis asmparser bcreader asmwriter scalaropts vmcore analysis support
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/gccas/Makefile b/tools/gccas/Makefile
index c5f6a497612159486a28ec14758add8380200837..25db47405e3f055be3f154689dc5ea318f016234 100644 (file)
--- a/tools/gccas/Makefile
+++ b/tools/gccas/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 
 TOOLNAME = gccas
-USEDLIBS = asmparser bcwriter scalaropts transforms analysis opt vmcore asmwriter support target 
+USEDLIBS = asmparser bcwriter transforms scalaropts target analysis vmcore asmwriter support 
 
 include $(LEVEL)/Makefile.common

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 73efe6526096429df5bbe88e98b79a4fa332a991..6acecc18142258108668a489c45a143a872e46b6 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = llc
-USEDLIBS = sparc regalloc sched select sparc regalloc sched select target opt instrument livevar bcreader bcwriter vmcore asmwriter analysis support transforms
+USEDLIBS = sparc regalloc sched select sparc regalloc sched select target instrument livevar bcreader bcwriter vmcore asmwriter analysis support transforms
 
 include $(LEVEL)/Makefile.common
 

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 54f675c28c9a5aff57374ad17dd7b419697a4994..3e3f0b0d9e914790169dceedaeeac113d4f2edb0 100644 (file)
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = lli
-USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support \
+USEDLIBS = bcreader bcwriter vmcore asmwriter analysis support \
           target transforms
 TOOLLINKOPTS = -ldl
 
@@ -16,6 +16,6 @@ Debug/RuntimeLib.ll: Debug/RuntimeLib.c
        /home/vadve/lattner/cvs/gcc_install/bin/gcc $< -S -o $@
 
 $(LEVEL)/tools/Debug/RuntimeLib.bc: Debug/RuntimeLib.ll
-       ../Debug/gccas $< -o $@
+       LD_LIBRARY_PATH=../lib/Debug:/usr/dcs/software/evaluation/encap/gcc-3.0.2/lib/ ../Debug/gccas $< -o $@
 
 

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index a4c11102019102988fd9962bca58df408cd2e3a1..a48cb74b59c40cc7741c83ed18c4ba869cdcbd27 100644 (file)
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../..
 TOOLNAME = opt
-USEDLIBS = opt bcreader bcwriter asmwriter analysis vmcore support instrument transforms scalaropts ipo target analysis
+USEDLIBS = bcreader bcwriter asmwriter analysis instrument transforms \
+           scalaropts ipo target analysis vmcore support
 
 include $(LEVEL)/Makefile.common