diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-06-29 21:12:26 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-06-29 21:12:26 +0000 |
| commit | 74deeb84bd33f0af8b77ae47530789ad17a1f4c2 (patch) | |
| tree | 44824451c145cb1f45ebc40d43fac3a5002b1fe2 | |
| parent | 6c839926babc7e3404974a4a5b39c6896d7fbf35 (diff) | |
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
| -rw-r--r-- | lib/Makefile | 12 | ||||
| -rw-r--r-- | tools/Makefile | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lib/Makefile b/lib/Makefile index 7199da52d4..147313ca76 100644 --- 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 5ed090ea0e..32b9965bb4 100644 --- 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 |