summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/tools/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm/tools/Makefile')
-rw-r--r--contrib/llvm/tools/Makefile20
1 files changed, 14 insertions, 6 deletions
diff --git a/contrib/llvm/tools/Makefile b/contrib/llvm/tools/Makefile
index 9bc74fe..aa07a2b 100644
--- a/contrib/llvm/tools/Makefile
+++ b/contrib/llvm/tools/Makefile
@@ -15,16 +15,13 @@ OPTIONAL_PARALLEL_DIRS := clang
# NOTE: The tools are organized into five groups of four consisting of one
# large and three small executables. This is done to minimize memory load
# in parallel builds. Please retain this ordering.
-
-# libEnhancedDisassembly must be built ahead of llvm-mc
-# because llvm-mc links against libEnhancedDisassembly
-DIRS := llvm-config edis llvm-mc
+DIRS := llvm-config
PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \
- lli llvm-extract \
+ lli llvm-extract llvm-mc \
bugpoint llvm-bcanalyzer llvm-stub \
- llvmc
+ llvmc llvm-diff
# Let users override the set of tools to build from the command line.
ifdef ONLY_TOOLS
@@ -34,6 +31,7 @@ endif
include $(LEVEL)/Makefile.config
+
# These libraries build as dynamic libraries (.dylib /.so), they can only be
# built if ENABLE_PIC is set.
ifeq ($(ENABLE_PIC),1)
@@ -46,6 +44,16 @@ ifeq ($(ENABLE_PIC),1)
else
PARALLEL_DIRS += lto
endif
+
+ PARALLEL_DIRS += bugpoint-passes
+
+ # The edis library is only supported if ARM and/or X86 are enabled, and if
+ # LLVM is being built PIC on platforms that support dylibs.
+ ifneq ($(DISABLE_EDIS),1)
+ ifneq ($(filter $(TARGETS_TO_BUILD), X86 ARM),)
+ PARALLEL_DIRS += edis
+ endif
+ endif
endif
endif
OpenPOWER on IntegriCloud