[llvm-commits] [llvm] r74783 - in /llvm/trunk: autoconf/configure.ac lib/Makefile tools/Makefile

[Mikhail Glushenkov]

Author: foldr
Date: Fri Jul  3 22:54:54 2009
New Revision: 74783

URL: http://llvm.org/viewvc/llvm-project?rev=74783&view=rev
Log:
LLVMC doesn't need ENABLE_PIC to build now.

Modified:
    llvm/trunk/autoconf/configure.ac
    llvm/trunk/lib/Makefile
    llvm/trunk/tools/Makefile

Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=74783&r1=74782&r2=74783&view=diff

==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Fri Jul  3 22:54:54 2009
@@ -605,10 +605,10 @@
 --enable-llvmc-dynamic,
 [Link LLVMC dynamically (default is NO, unless on Win32)]),,
 enableval=$llvmc_dynamic)
-if test ${enableval} = "no"; then
-   AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[]])
-else
+if test ${enableval} = "yes" && test "$ENABLE_PIC" -eq 1; then
    AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[ENABLE_LLVMC_DYNAMIC=1]])
+else
+   AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[]])
 fi
 
 dnl===-----------------------------------------------------------------------===

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

==============================================================================
--- llvm/trunk/lib/Makefile (original)
+++ llvm/trunk/lib/Makefile Fri Jul  3 22:54:54 2009
@@ -11,13 +11,7 @@
 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
+                Target ExecutionEngine Debugger Linker MC CompilerDriver
 
 include $(LEVEL)/Makefile.common
 

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

==============================================================================
--- llvm/trunk/tools/Makefile (original)
+++ llvm/trunk/tools/Makefile Fri Jul  3 22:54:54 2009
@@ -21,7 +21,7 @@
                  llvm-ld llvm-prof llvm-link \
                  lli gccas gccld llvm-extract llvm-db \
                  bugpoint llvm-bcanalyzer llvm-stub \
-                 llvm-mc
+                 llvm-mc llvmc
 
 # Let users override the set of tools to build from the command line.
 ifdef ONLY_TOOLS
@@ -32,7 +32,7 @@
 include $(LEVEL)/Makefile.config
 
 ifeq ($(ENABLE_PIC),1)
-  DIRS += lto llvmc
+  DIRS += lto
   ifdef BINUTILS_INCDIR
     DIRS += gold
   endif