diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index 54f675c28c9..3e3f0b0d9e9 100644
--- 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 aab1c2f93e5..065b093b5ad 100644
--- 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 c5f6a497612..25db47405e3 100644
--- 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 73efe652609..6acecc18142 100644
--- 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 54f675c28c9..3e3f0b0d9e9 100644
--- 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 a4c11102019..a48cb74b59c 100644
--- 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