diff options
| author | Eric Christopher <echristo@gmail.com> | 2013-08-02 01:51:52 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2013-08-02 01:51:52 +0000 |
| commit | 3b5ea5178d32853b77f3448cfbd43e3abdb0e6bb (patch) | |
| tree | 2566fddb2a1de80119d96d99cbac68f59fd75e6a | |
| parent | 007af3d14cf271e6333182ae1404d5e7ce801bb4 (diff) | |
| download | bcm5719-llvm-3b5ea5178d32853b77f3448cfbd43e3abdb0e6bb.tar.gz bcm5719-llvm-3b5ea5178d32853b77f3448cfbd43e3abdb0e6bb.zip | |
Use @rpath for libraries rather than @executable_path on OSX.
Patch by Benjamin Scarlet!
llvm-svn: 187641
| -rw-r--r-- | llvm/runtime/libprofile/Makefile | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-shlib/Makefile | 2 | ||||
| -rw-r--r-- | llvm/tools/lto/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/llvm/runtime/libprofile/Makefile b/llvm/runtime/libprofile/Makefile index 914d1917e98..2f061adcd53 100644 --- 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 9498a27d77b..1d9053b3d3b 100644 --- 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 30719f49b1d..56c67df3739 100644 --- 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. |
