diff options
| -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 9d2e576dfb..9bc74fe3fa 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 9151f627bb..0d2e26f233 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 |