[llvm-commits] [llvm] r74456 - in /llvm/trunk: lib/Makefile tools/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jun 29 16:12:26 2009
New Revision: 74456

URL: http://llvm.org/viewvc/llvm-project?rev=74456&view=rev
Log:
Don't build LLVMC when configured with --disable-pic (it needs requires shared
module support to build).

Modified:
    llvm/trunk/lib/Makefile
    llvm/trunk/tools/Makefile

Modified: llvm/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Makefile?rev=74456&r1=74455&r2=74456&view=diff

==============================================================================
--- llvm/trunk/lib/Makefile (original)
+++ llvm/trunk/lib/Makefile Mon Jun 29 16:12:26 2009
@@ -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
 

Modified: llvm/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/Makefile?rev=74456&r1=74455&r2=74456&view=diff

==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Mon Jun 29 16:12:26 2009
@@ -20,7 +20,7 @@
                  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 @@
 include $(LEVEL)/Makefile.config
 
 ifeq ($(ENABLE_PIC),1)
-  DIRS += lto
+  DIRS += lto llvmc
   ifdef BINUTILS_INCDIR
     DIRS += gold
   endif