diff options
| author | Sean Callanan <scallanan@apple.com> | 2010-04-12 21:55:49 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2010-04-12 21:55:49 +0000 |
| commit | 2fb938fd42fe12ca5deb560eb1ba1c646c87fc69 (patch) | |
| tree | 944fd73002bda2b1ff6aeca98cf139896f7eef62 /tools/edis/Makefile | |
| parent | ca9b7037e28759c200fe5ca98190cabd121a1bba (diff) | |
| download | external_llvm-2fb938fd42fe12ca5deb560eb1ba1c646c87fc69.zip external_llvm-2fb938fd42fe12ca5deb560eb1ba1c646c87fc69.tar.gz external_llvm-2fb938fd42fe12ca5deb560eb1ba1c646c87fc69.tar.bz2 | |
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
Diffstat (limited to 'tools/edis/Makefile')
| -rw-r--r-- | tools/edis/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/edis/Makefile b/tools/edis/Makefile index a6d99c7..57b941e 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" |