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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100163 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/edis/Makefile b/tools/edis/Makefile
index cd8f4b067ae862ae08193782273075413c46f97e..7f7b097e2ce37c440347a6dfbc8b39359d6de436 100644 (file)
--- a/tools/edis/Makefile
+++ b/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