[llvm] r194418 - Change libLTO back to linking with @executable_path instead of @rpath.

Bob Wilson bob.wilson at apple.com
Mon Nov 11 12:08:25 PST 2013


Author: bwilson
Date: Mon Nov 11 14:08:24 2013
New Revision: 194418

URL: http://llvm.org/viewvc/llvm-project?rev=194418&view=rev
Log:
Change libLTO back to linking with @executable_path instead of @rpath.

This partially reverts r187641 until ld64 adopts a change to link with an
rpath setting.

Modified:
    llvm/trunk/tools/lto/Makefile

Modified: llvm/trunk/tools/lto/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/Makefile?rev=194418&r1=194417&r2=194418&view=diff
==============================================================================
--- llvm/trunk/tools/lto/Makefile (original)
+++ llvm/trunk/tools/lto/Makefile Mon Nov 11 14:08:24 2013
@@ -46,7 +46,7 @@ ifeq ($(HOST_OS),Darwin)
     ifneq ($(DARWIN_VERS),8)
        LLVMLibsOptions    := $(LLVMLibsOptions)  \
                             -Wl,-install_name \
-                            -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
+                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
 
     # If we're doing an Apple-style build, add the LTO object path.





More information about the llvm-commits mailing list