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 914d1917e98db9acd75c0a60a2128e516e78cc33..2f061adcd53f17da48025f37d1d2b01194aa72bf 100644 (file)
--- 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 9498a27d77b9efd5f313d02c9f27aef2ff7f8256..1d9053b3d3ba7b1e4648f7fe2a9bda7f42e49b90 100644 (file)
--- 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 30719f49b1dfbbfe6f9584d4836e98f37f62e162..56c67df37394821f0e4ae9e1ae6e47f24c20b411 100644 (file)
--- 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.