[llvm-commits] [llvm] r98773 - /llvm/trunk/tools/edis/Makefile

Sean Callanan scallanan at apple.com
Wed Mar 17 15:01:36 PDT 2010


Author: spyffe
Date: Wed Mar 17 17:01:36 2010
New Revision: 98773

URL: http://llvm.org/viewvc/llvm-project?rev=98773&view=rev
Log:
Changed install_name for libEnhancedDisassembly.dylib on
Mac OS X to match current install location.  This has no
effect on other platforms.

Modified:
    llvm/trunk/tools/edis/Makefile

Modified: llvm/trunk/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/edis/Makefile?rev=98773&r1=98772&r2=98773&view=diff
==============================================================================
--- llvm/trunk/tools/edis/Makefile (original)
+++ llvm/trunk/tools/edis/Makefile Wed Mar 17 17:01:36 2010
@@ -39,11 +39,12 @@
                          -Wl,-seg1addr -Wl,0xE0000000 
 
     # 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,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
+                            -Wl,"/Developer/usr/local/lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
 endif
 





More information about the llvm-commits mailing list