diff options
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/tools/Makefile b/tools/Makefile index 68ce314c92a1..8bf091a72a08 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -9,8 +9,15 @@ LEVEL := .. +include $(LEVEL)/Makefile.config + # Build clang if present. -OPTIONAL_PARALLEL_DIRS := clang + +ifneq ($(CLANG_SRC_ROOT),) + OPTIONAL_PARALLEL_DIRS := $(CLANG_SRC_ROOT) +else + OPTIONAL_PARALLEL_DIRS := clang +endif # Build LLDB if present. Note LLDB must be built last as it depends on the # wider LLVM infrastructure (including Clang). @@ -25,9 +32,9 @@ PARALLEL_DIRS := opt llvm-as llvm-dis \ llvm-ld llvm-prof llvm-link \ lli llvm-extract llvm-mc \ bugpoint llvm-bcanalyzer llvm-stub \ - llvm-diff macho-dump llvm-objdump \ + llvm-diff macho-dump llvm-objdump llvm-readobj \ llvm-rtdyld llvm-dwarfdump llvm-cov \ - llvm-size + llvm-size llvm-stress # Let users override the set of tools to build from the command line. ifdef ONLY_TOOLS @@ -36,9 +43,6 @@ ifdef ONLY_TOOLS PARALLEL_DIRS := $(filter-out lldb,$(ONLY_TOOLS)) endif -include $(LEVEL)/Makefile.config - - # These libraries build as dynamic libraries (.dylib /.so), they can only be # built if ENABLE_PIC is set. ifndef ONLY_TOOLS @@ -52,14 +56,6 @@ ifeq ($(ENABLE_PIC),1) 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 ifdef LLVM_HAS_POLLY |