diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2010-07-14 22:41:51 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2010-07-14 22:41:51 +0000 |
| commit | 8f70c3d97c14c086a17880a6ed183446e6323297 (patch) | |
| tree | c1394eab10fb46c846a5bc85d481a20e3ea8c4ca | |
| parent | 38e59891ee4417a9be2f8146ce0ba3269e38ac21 (diff) | |
| download | external_llvm-8f70c3d97c14c086a17880a6ed183446e6323297.zip external_llvm-8f70c3d97c14c086a17880a6ed183446e6323297.tar.gz external_llvm-8f70c3d97c14c086a17880a6ed183446e6323297.tar.bz2 | |
Remove some broken code to check the DISABLE_EDIS flag (edis is now in the
DIRS list, so it does no good to filter it from PARALLEL_DIRS), and replace
it with a check to disable building the shared library version of edis when
the flag is set. Disabling it entirely does not work because MC uses it now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108367 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/Makefile | 5 | ||||
| -rw-r--r-- | tools/edis/Makefile | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile index 9d2e576..9bc74fe 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -49,9 +49,4 @@ ifeq ($(ENABLE_PIC),1) endif endif -# Don't build edis if we explicitly disabled it. -ifeq ($(DISABLE_EDIS),1) - PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS)) -endif - include $(LEVEL)/Makefile.common diff --git a/tools/edis/Makefile b/tools/edis/Makefile index 9151f62..0d2e26f 100644 --- a/tools/edis/Makefile +++ b/tools/edis/Makefile @@ -20,10 +20,12 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/EnhancedDisassembly.exports include $(LEVEL)/Makefile.config ifeq ($(ENABLE_PIC),1) + ifneq ($(DISABLE_EDIS),1) ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 endif + endif endif LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler |