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

diff --git a/tools/Makefile b/tools/Makefile
index 9d2e576dfbdcbb149269d6a2a310c3ffaa704dea..9bc74fe3fa4cd8a6939d216a5487f27372877a9b 100644 (file)
--- 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 9151f627bb0ccb7766649489138569f3f7a7792c..0d2e26f23387240f73260a76abc3a0c7888eddd6 100644 (file)
--- 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