RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

Remove some broken code to check the DISABLE_EDIS flag (edis is now in the

Browse Source 
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:
Bob Wilson 2010-07-14 22:41:51 +00:00
parent da3e6cdb26
commit 1f4fed20a5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/Makefile
View File

@ -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

2
tools/edis/Makefile
View File

@ -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