Don't build LLVMC when configured with --disable-pic (it needs requires shared

module support to build).

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

diff --git a/lib/Makefile b/lib/Makefile
index 7199da52d489cf6e65344bf98c9a3f136e97406c..147313ca76d96bb9accec43a935da01cbb70bb48 100644 (file)
--- a/lib/Makefile
+++ b/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/tools/Makefile b/tools/Makefile
index 5ed090ea0e0e12f560dc45fa88edc266b7d77f5d..32b9965bb4bd5b55c7e77c549c5852b9d6100378 100644 (file)
--- a/tools/Makefile
+++ b/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