diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2009-07-04 03:54:54 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2009-07-04 03:54:54 +0000 |
| commit | 86a3510a68928885412a00e1698ab0297dcaf199 (patch) | |
| tree | ae8fa9d31a225354b16bd6640314af3ad10e5d1f | |
| parent | 9d1a81daaa4c7f1811359cc6b9bc84b1678345b5 (diff) | |
| download | external_llvm-86a3510a68928885412a00e1698ab0297dcaf199.zip external_llvm-86a3510a68928885412a00e1698ab0297dcaf199.tar.gz external_llvm-86a3510a68928885412a00e1698ab0297dcaf199.tar.bz2 | |
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
| -rw-r--r-- | autoconf/configure.ac | 6 | ||||
| -rw-r--r-- | lib/Makefile | 8 | ||||
| -rw-r--r-- | tools/Makefile | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index bb9c9d8..3812222 100644 --- 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 147313c..1e87d9e 100644 --- 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 32b9965..4f0f54b 100644 --- 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 |