From 8129804f8b8f5ac3762e42e651bb7f57355fd8b4 Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Sat, 20 May 2023 12:19:34 -0400 Subject: [PATCH] ICU-21458 icu4c support for macOS @rpath On Darwin: --enable-rpath incorrectly uses an absolute path rather than an @rpath prefix. --disable-rpath incorrectly uses a relative path rather than an absolute path. It also uses $(PKGDATA_TRAILING_SPACE) unnecessarily. --- icu4c/source/config/mh-darwin | 4 ++-- icu4c/source/config/mh-darwin-ppc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin index 7b15709c860..569fe1c6d99 100644 --- a/icu4c/source/config/mh-darwin +++ b/icu4c/source/config/mh-darwin @@ -31,9 +31,9 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) ## Compiler switches to embed a library name and version information ifeq ($(ENABLE_RPATH),YES) -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @rpath/$(notdir $(MIDDLE_SO_TARGET)) else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) endif ## Compiler switch to embed a runtime search path diff --git a/icu4c/source/config/mh-darwin-ppc b/icu4c/source/config/mh-darwin-ppc index c99a3f68294..252bd724abc 100644 --- a/icu4c/source/config/mh-darwin-ppc +++ b/icu4c/source/config/mh-darwin-ppc @@ -31,9 +31,9 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) ## Compiler switches to embed a library name and version information ifeq ($(ENABLE_RPATH),YES) -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @rpath/$(notdir $(MIDDLE_SO_TARGET)) else -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) endif ## Compiler switch to embed a runtime search path