[llvm-branch-commits] [llvm-branch] r98785 - in /llvm/branches/Apple/Morbo: ./ tools/edis/Makefile

[Bill Wendling]

Author: void
Date: Wed Mar 17 19:25:07 2010
New Revision: 98785

URL: http://llvm.org/viewvc/llvm-project?rev=98785&view=rev
Log:
$ svn merge -c 98773 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r98773 into '.':
U    tools/edis/Makefile


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/tools/edis/Makefile

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 17 19:25:07 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98778,98780
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743-98744,98773,98778,98780

Modified: llvm/branches/Apple/Morbo/tools/edis/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/tools/edis/Makefile?rev=98785&r1=98784&r2=98785&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/tools/edis/Makefile (original)
+++ llvm/branches/Apple/Morbo/tools/edis/Makefile Wed Mar 17 19:25:07 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