summaryrefslogtreecommitdiff
path: root/tools/Makefile
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-07-20 20:55:57 +0000
committerChris Lattner <sabre@nondot.org>2010-07-20 20:55:57 +0000
commite744ab26fd11ba42cb9ba6805da572fb8e648c2a (patch)
tree2d20acf796c9042c1fcbd9a75d5b069050e2a5e1 /tools/Makefile
parentb676d9815dc7ce3a14d655322f307f335708155b (diff)
downloadllvm-e744ab26fd11ba42cb9ba6805da572fb8e648c2a.tar.gz
llvm-e744ab26fd11ba42cb9ba6805da572fb8e648c2a.tar.bz2
llvm-e744ab26fd11ba42cb9ba6805da572fb8e648c2a.tar.xz
fix DISABLE_EDIS
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108925 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/Makefile')
-rw-r--r--tools/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 7f0f1df714..6e23dac111 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -16,7 +16,7 @@ OPTIONAL_PARALLEL_DIRS := clang
# large and three small executables. This is done to minimize memory load
# in parallel builds. Please retain this ordering.
DIRS := llvm-config
-PARALLEL_DIRS := opt llvm-as llvm-dis edis \
+PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \
lli llvm-extract llvm-mc \
@@ -49,7 +49,7 @@ ifeq ($(ENABLE_PIC),1)
# LLVM is being built PIC on platforms that support dylibs.
ifneq ($(DISABLE_EDIS),1)
ifneq ($(filter $(TARGETS_TO_BUILD), X86 ARM),)
- PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+ PARALLEL_DIRS += edis
endif
endif
endif