summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Makefile12
-rw-r--r--tools/Makefile4
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