From 2fb938fd42fe12ca5deb560eb1ba1c646c87fc69 Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Mon, 12 Apr 2010 21:55:49 +0000 Subject: Build system fixes. llvm-mc depends on libEnhancedDisassembly, so we now build the static library in all cases (although the shared library is only built when requested/possible). Also, fixed a bug where edis wasn't properly initializing the targets it uses. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101072 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/edis/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools/edis') diff --git a/tools/edis/Makefile b/tools/edis/Makefile index a6d99c7562..57b941e7e4 100644 --- a/tools/edis/Makefile +++ b/tools/edis/Makefile @@ -17,8 +17,12 @@ BUILT_SOURCES = EDInfo.inc # early so we can set up LINK_COMPONENTS before including Makefile.rules include $(LEVEL)/Makefile.config -LINK_LIBS_IN_SHARED = 1 -SHARED_LIBRARY = 1 +ifeq ($(ENABLE_PIC),1) + ifneq ($(TARGET_OS), $(filter $(TARGET_OS), Cygwin MingW)) + LINK_LIBS_IN_SHARED = 1 + SHARED_LIBRARY = 1 + endif +endif LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler @@ -55,8 +59,7 @@ ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD))) EDIS_DEFINES := $(EDIS_DEFINES) -DEDIS_ARM endif -CXXFLAGS := $(CXXFLAGS) -#$(EDIS_DEFINES) +CXXFLAGS := $(CXXFLAGS) $(EDIS_DEFINES) EDInfo.inc: $(TBLGEN) $(Echo) "Building semantic information header" -- cgit v1.2.3