From: Eric Christopher <echristo@gmail.com>
Date: Fri, 2 Aug 2013 01:51:52 +0000 (+0000)
Subject: Use @rpath for libraries rather than @executable_path on OSX.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f4eaaf0dca65851ecdd16d266f49edfd2b11949;p=oota-llvm.git

Use @rpath for libraries rather than @executable_path on OSX.

Patch by Benjamin Scarlet!

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

diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile
index 914d1917e98..2f061adcd53 100644
--- a/runtime/libprofile/Makefile
+++ b/runtime/libprofile/Makefile
@@ -40,7 +40,7 @@ ifeq ($(HOST_OS),Darwin)
     ifneq ($(DARWIN_VERS),8)
        LLVMLibsOptions    := $(LLVMLibsOptions) \
                             -Wl,-install_name \
-                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
+                            -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
 
     # If we're doing an Apple-style build, add the LTO object path.
diff --git a/tools/llvm-shlib/Makefile b/tools/llvm-shlib/Makefile
index 9498a27d77b..1d9053b3d3b 100644
--- a/tools/llvm-shlib/Makefile
+++ b/tools/llvm-shlib/Makefile
@@ -58,7 +58,7 @@ ifeq ($(HOST_OS),Darwin)
     ifneq ($(DARWIN_VERS),8)
        LLVMLibsOptions    := $(LLVMLibsOptions)  \
                             -Wl,-install_name \
-                            -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
+                            -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
 endif
 
diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 30719f49b1d..56c67df3739 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,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"
+                            -Wl,"@rpath/lib$(LIBRARYNAME)$(SHLIBEXT)"
     endif
 
     # If we're doing an Apple-style build, add the LTO object path.