LLVMC doesn't need ENABLE_PIC to build now.

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

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index bb9c9d84b0091acb2a921ffdd9f589203125b29d..3812222c6dc48d34ba074880c3ed1279464a983e 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -605,10 +605,10 @@ AC_ARG_ENABLE(llvmc-dynamic,AS_HELP_STRING(
 --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===-----------------------------------------------------------------------===

diff --git a/lib/Makefile b/lib/Makefile
index 147313ca76d96bb9accec43a935da01cbb70bb48..1e87d9ebfd10cbde626922ff2be20076e4baccb5 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,13 +11,7 @@ LEVEL = ..
 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
 

diff --git a/tools/Makefile b/tools/Makefile
index 32b9965bb4bd5b55c7e77c549c5852b9d6100378..4f0f54bdfbf84c1dd117880783beaba6e03231fd 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,7 +21,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
                  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 @@ endif
 include $(LEVEL)/Makefile.config
 
 ifeq ($(ENABLE_PIC),1)
-  DIRS += lto llvmc
+  DIRS += lto
   ifdef BINUTILS_INCDIR
     DIRS += gold
   endif