mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-19 02:52:53 +02:00
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. llvm-svn: 108367
This commit is contained in:
parent
da3e6cdb26
commit
1f4fed20a5
@ -49,9 +49,4 @@ ifeq ($(ENABLE_PIC),1)
|
|||||||
endif
|
endif
|
||||||
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
|
include $(LEVEL)/Makefile.common
|
||||||
|
@ -20,10 +20,12 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/EnhancedDisassembly.exports
|
|||||||
include $(LEVEL)/Makefile.config
|
include $(LEVEL)/Makefile.config
|
||||||
|
|
||||||
ifeq ($(ENABLE_PIC),1)
|
ifeq ($(ENABLE_PIC),1)
|
||||||
|
ifneq ($(DISABLE_EDIS),1)
|
||||||
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
|
ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW))
|
||||||
LINK_LIBS_IN_SHARED = 1
|
LINK_LIBS_IN_SHARED = 1
|
||||||
SHARED_LIBRARY = 1
|
SHARED_LIBRARY = 1
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler
|
LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler
|
||||||
|
Loading…
Reference in New Issue
Block a user