projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change push_all to a non-virtual function and implement it in the
[oota-llvm.git]
/
tools
/
Makefile
diff --git
a/tools/Makefile
b/tools/Makefile
index 0c9a9644a5b650cb3251e0f75e7ea13c84d652b8..9d2e576dfbdcbb149269d6a2a310c3ffaa704dea 100644
(file)
--- a/
tools/Makefile
+++ b/
tools/Makefile
@@
-15,13
+15,16
@@
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.
# 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.
-DIRS := llvm-config
+
+# libEnhancedDisassembly must be built ahead of llvm-mc
+# because llvm-mc links against libEnhancedDisassembly
+DIRS := llvm-config edis llvm-mc
PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \
lli llvm-extract \
bugpoint llvm-bcanalyzer llvm-stub \
PARALLEL_DIRS := opt llvm-as llvm-dis \
llc llvm-ranlib llvm-ar llvm-nm \
llvm-ld llvm-prof llvm-link \
lli llvm-extract \
bugpoint llvm-bcanalyzer llvm-stub \
- llvm
-mc llvm
c
+ llvmc
# Let users override the set of tools to build from the command line.
ifdef ONLY_TOOLS
# Let users override the set of tools to build from the command line.
ifdef ONLY_TOOLS
@@
-36,8
+39,6
@@
include $(LEVEL)/Makefile.config
ifeq ($(ENABLE_PIC),1)
# No support for dynamic libraries on windows targets.
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
ifeq ($(ENABLE_PIC),1)
# No support for dynamic libraries on windows targets.
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
- PARALLEL_DIRS += edis
-
# gold only builds if binutils is around. It requires "lto" to build before
# it so it is added to DIRS.
ifdef BINUTILS_INCDIR
# gold only builds if binutils is around. It requires "lto" to build before
# it so it is added to DIRS.
ifdef BINUTILS_INCDIR
@@
-48,13
+49,8
@@
ifeq ($(ENABLE_PIC),1)
endif
endif
endif
endif
-# Only build edis if X86 target support is enabled.
-ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
- PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
-endif
-
# Don't build edis if we explicitly disabled it.
# Don't build edis if we explicitly disabled it.
-if
n
eq ($(DISABLE_EDIS),1)
+ifeq ($(DISABLE_EDIS),1)
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
endif
PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
endif