diff options
| author | Sean Callanan <scallanan@apple.com> | 2010-04-02 00:53:42 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2010-04-02 00:53:42 +0000 |
| commit | dfc8a75755d0e109b8611958e6691a78f3dd954b (patch) | |
| tree | 213540029470ae5b8af8df91674636faef2d0399 /llvm | |
| parent | 0e3218f6afa717668ed5e9031e6037f914d6ad73 (diff) | |
| download | bcm5719-llvm-dfc8a75755d0e109b8611958e6691a78f3dd954b.tar.gz bcm5719-llvm-dfc8a75755d0e109b8611958e6691a78f3dd954b.zip | |
Updated the install location for EnhancedDisassembly
on Mac OS X to use @rpath rather than an absolute
path. Also allowed the version to be set using an
environment variable.
llvm-svn: 100163
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/tools/edis/Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/llvm/tools/edis/Makefile b/llvm/tools/edis/Makefile index cd8f4b067ae..7f7b097e2ce 100644 --- a/llvm/tools/edis/Makefile +++ b/llvm/tools/edis/Makefile @@ -25,26 +25,23 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) x86asmprinter x86disassembler include $(LEVEL)/Makefile.common ifeq ($(HOST_OS),Darwin) - # set dylib internal version number to llvmCore submission number - ifdef LLVM_SUBMIT_VERSION - LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-current_version \ - -Wl,$(LLVM_SUBMIT_VERSION).$(LLVM_SUBMIT_SUBVERSION) \ - -Wl,-compatibility_version -Wl,1 - endif # extra options to override libtool defaults LLVMLibsOptions := $(LLVMLibsOptions) \ -avoid-version \ -Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/EnhancedDisassembly.exports \ - -Wl,-dead_strip \ - -Wl,-seg1addr -Wl,0xE0000000 + -Wl,-dead_strip + + ifdef EDIS_VERSION + LLVMLibsOptions := -Wl,-current_version -Wl,$(EDIS_VERSION) \ + -Wl,-compatibility_version -Wl,1 + endif # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line - # Path is /Developer/usr/local/lib for now; will use an rpath-based mechanism soon DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') ifneq ($(DARWIN_VERS),8) LLVMLibsOptions := $(LLVMLibsOptions) \ -no-undefined -Wl,-install_name \ - -Wl,"/Developer/usr/local/lib/lib$(LIBRARYNAME)$(SHLIBEXT)" + -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)" endif endif |
