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 | f1a6d7abc370b4ea7da3629a23e88de748cfbc87 (patch) | |
| tree | 85e93236b37f6378aac8114688ed6f3bfca153af /llvm | |
| parent | 92d89983481749737fe496cc59674475643f20cd (diff) | |
| download | bcm5719-llvm-f1a6d7abc370b4ea7da3629a23e88de748cfbc87.tar.gz bcm5719-llvm-f1a6d7abc370b4ea7da3629a23e88de748cfbc87.zip | |
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
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/tools/Makefile | 5 | ||||
| -rw-r--r-- | llvm/tools/edis/Makefile | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/llvm/tools/Makefile b/llvm/tools/Makefile index 9d2e576dfbd..9bc74fe3fa4 100644 --- a/llvm/tools/Makefile +++ b/llvm/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/llvm/tools/edis/Makefile b/llvm/tools/edis/Makefile index 9151f627bb0..0d2e26f2338 100644 --- a/llvm/tools/edis/Makefile +++ b/llvm/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 |
