From 9f4eaaf0dca65851ecdd16d266f49edfd2b11949 Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 2 Aug 2013 01:51:52 +0000 Subject: 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 --- tools/llvm-shlib/Makefile | 2 +- tools/lto/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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. -- cgit v1.2.3