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 | 9f4eaaf0dca65851ecdd16d266f49edfd2b11949 (patch) | |
| tree | b75fabed34c436e7ef9e59a8181758685aedaf1f | |
| parent | be9f508aecfd255f47f8ea3cfe4fadbf1382ba10 (diff) | |
| download | llvm-9f4eaaf0dca65851ecdd16d266f49edfd2b11949.tar.gz llvm-9f4eaaf0dca65851ecdd16d266f49edfd2b11949.tar.bz2 llvm-9f4eaaf0dca65851ecdd16d266f49edfd2b11949.tar.xz | |
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
| -rw-r--r-- | runtime/libprofile/Makefile | 2 | ||||
| -rw-r--r-- | tools/llvm-shlib/Makefile | 2 | ||||
| -rw-r--r-- | tools/lto/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/libprofile/Makefile b/runtime/libprofile/Makefile index 914d1917e9..2f061adcd5 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 9498a27d77..1d9053b3d3 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 30719f49b1..56c67df373 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. |