From fdbbc52cfdcc7c80dda692c4bcd530c505fa5b10 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 29 Jun 2009 21:12:26 +0000
Subject: [PATCH] Don't build LLVMC when configured with --disable-pic (it
 needs requires shared module support to build).

llvm-svn: 74456
---
 llvm/lib/Makefile   | 12 ++++++++++--
 llvm/tools/Makefile |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/Makefile b/llvm/lib/Makefile
index 7199da52d489..147313ca76d9 100644
--- a/llvm/lib/Makefile
+++ b/llvm/lib/Makefile
@@ -8,8 +8,16 @@
 ##===----------------------------------------------------------------------===##
 LEVEL = ..
 
-PARALLEL_DIRS = VMCore AsmParser Bitcode Archive Analysis Transforms CodeGen \
-                Target ExecutionEngine Debugger Linker CompilerDriver MC
+include $(LEVEL)/Makefile.config
+
+PARALLEL_DIRS := VMCore AsmParser Bitcode Archive Analysis Transforms CodeGen \
+                Target ExecutionEngine Debugger Linker MC
+
+# Only build the CompilerDriver when PIC is enabled.
+
+ifeq ($(ENABLE_PIC),1)
+PARALLEL_DIRS += CompilerDriver
+endif
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile
index 5ed090ea0e0e..32b9965bb4bd 100644
--- a/llvm/tools/Makefile
+++ b/llvm/tools/Makefile
@@ -20,7 +20,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
                  lli gccas gccld llvm-extract llvm-db \
-                 bugpoint llvm-bcanalyzer llvm-stub llvmc \
+                 bugpoint llvm-bcanalyzer llvm-stub \
                  llvm-mc
 
 # Let users override the set of tools to build from the command line.
@@ -32,7 +32,7 @@ endif
 include $(LEVEL)/Makefile.config
 
 ifeq ($(ENABLE_PIC),1)
-  DIRS += lto
+  DIRS += lto llvmc
   ifdef BINUTILS_INCDIR
     DIRS += gold
   endif