diff options
| author | rdivacky <rdivacky@FreeBSD.org> | 2010-07-15 17:06:11 +0000 |
|---|---|---|
| committer | rdivacky <rdivacky@FreeBSD.org> | 2010-07-15 17:06:11 +0000 |
| commit | c1c3262b63b1d5fbba6a7ad188f4e47d92c7840e (patch) | |
| tree | 5b6d391c72c9875f0065f0e772e872bc8544834b /tools | |
| parent | 9112829d76cbb8e0c8ef51bbc2d7d1be48cd7b74 (diff) | |
| download | FreeBSD-src-c1c3262b63b1d5fbba6a7ad188f4e47d92c7840e.zip FreeBSD-src-c1c3262b63b1d5fbba6a7ad188f4e47d92c7840e.tar.gz | |
Update LLVM to r108428.
Diffstat (limited to 'tools')
| -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 9d2e576..9bc74fe 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 9151f62..0d2e26f 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 |
