projects / platform / upstream / llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 007af3d)
Use @rpath for libraries rather than @executable_path on OSX.
authorEric Christopher <echristo@gmail.com>
Fri, 2 Aug 2013 01:51:52 +0000 (01:51 +0000)
committerEric Christopher <echristo@gmail.com>
Fri, 2 Aug 2013 01:51:52 +0000 (01:51 +0000)
Patch by Benjamin Scarlet!

llvm-svn: 187641

llvm/runtime/libprofile/Makefile patch | blob | history
llvm/tools/llvm-shlib/Makefile patch | blob | history
llvm/tools/lto/Makefile patch | blob | history

diff --git a/llvm/runtime/libprofile/Makefile b/llvm/runtime/libprofile/Makefile
index 914d191..2f061ad 100644 (file)
--- a/llvm/runtime/libprofile/Makefile
+++ b/llvm/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/llvm/tools/llvm-shlib/Makefile b/llvm/tools/llvm-shlib/Makefile
index 9498a27..1d9053b 100644 (file)
--- a/llvm/tools/llvm-shlib/Makefile
+++ b/llvm/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/llvm/tools/lto/Makefile b/llvm/tools/lto/Makefile
index 30719f4..56c67df 100644 (file)
--- a/llvm/tools/lto/Makefile
+++ b/llvm/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.
Domain: System / Toolchain;