Skip to content

Commit 74deeb8

Browse files
committed
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
1 parent 6c83992 commit 74deeb8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

lib/Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,16 @@
88
##===----------------------------------------------------------------------===##
99
LEVEL = ..
1010

11-
PARALLEL_DIRS = VMCore AsmParser Bitcode Archive Analysis Transforms CodeGen \
12-
Target ExecutionEngine Debugger Linker CompilerDriver MC
11+
include $(LEVEL)/Makefile.config
12+
13+
PARALLEL_DIRS := VMCore AsmParser Bitcode Archive Analysis Transforms CodeGen \
14+
Target ExecutionEngine Debugger Linker MC
15+
16+
# Only build the CompilerDriver when PIC is enabled.
17+
18+
ifeq ($(ENABLE_PIC),1)
19+
PARALLEL_DIRS += CompilerDriver
20+
endif
1321

1422
include $(LEVEL)/Makefile.common
1523

tools/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \
2020
llc llvm-ranlib llvm-ar llvm-nm \
2121
llvm-ld llvm-prof llvm-link \
2222
lli gccas gccld llvm-extract llvm-db \
23-
bugpoint llvm-bcanalyzer llvm-stub llvmc \
23+
bugpoint llvm-bcanalyzer llvm-stub \
2424
llvm-mc
2525

2626
# Let users override the set of tools to build from the command line.
@@ -32,7 +32,7 @@ endif
3232
include $(LEVEL)/Makefile.config
3333

3434
ifeq ($(ENABLE_PIC),1)
35-
DIRS += lto
35+
DIRS += lto llvmc
3636
ifdef BINUTILS_INCDIR
3737
DIRS += gold
3838
endif

0 commit comments

Comments
 (0)