summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-25 13:59:12 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-01-25 13:59:12 +0100
commit261b34bd068b413cbe015502aa32001d0234da24 (patch)
tree764da803a389d4ebb554196c3ae7be546d757514
parent1e43e80592224c2274d81a6e7c97fd5259c0c2fb (diff)
downloadATCD-261b34bd068b413cbe015502aa32001d0234da24.tar.gz
Integrate patch from conda-forge ace-feedstock, see https://github.com/conda-forge/ace-feedstock/blob/master/recipe/fix_macos_rpath.patch
* ACE/include/makeinclude/platform_macosx_yosemite.GNU:
-rw-r--r--ACE/include/makeinclude/platform_macosx_yosemite.GNU2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/include/makeinclude/platform_macosx_yosemite.GNU b/ACE/include/makeinclude/platform_macosx_yosemite.GNU
index 8c63a923a44..d23fbda1c59 100644
--- a/ACE/include/makeinclude/platform_macosx_yosemite.GNU
+++ b/ACE/include/makeinclude/platform_macosx_yosemite.GNU
@@ -3,7 +3,7 @@ include $(ACE_ROOT)/include/makeinclude/platform_macosx_mavericks.GNU
## The following is to circumvent the restriction of System Integrity Protection (SIP)
## by embedding the path information of dynamic libraries into the executables.
-SOFLAGS += -install_name @rpath/$@
+SOFLAGS += -install_name @rpath/$(notdir $@)
space := $(subst ,, )
LDFLAGS += $(foreach libpath,$(LIBPATHS),-rpath $(if $(filter "/%,$(subst $(space),;,$(libpath))),$(libpath),@executable_path/$(libpath)))