From: Bob Wilson <bob.wilson@apple.com>
Date: Mon, 11 Nov 2013 20:08:24 +0000 (+0000)
Subject: Change libLTO back to linking with @executable_path instead of @rpath.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=2531651206a2d12d37ad93a6f9bc9f8762105b4e

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.

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

diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 672fef4c64f..cedbee188c0 100644
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -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.