bug-915735 (1432B)
1 Bug 915735 - Fix linking the ICU libraries on Mac 2 3 diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin 4 --- a/intl/icu/source/config/mh-darwin 5 +++ b/intl/icu/source/config/mh-darwin 6 @@ -25,21 +25,17 @@ ARFLAGS += -c 7 COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c 8 COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c 9 10 ## Commands to make a shared library 11 SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) 12 SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) 13 14 ## Compiler switches to embed a library name and version information 15 -ifeq ($(ENABLE_RPATH),YES) 16 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) 17 -else 18 -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) 19 -endif 20 +LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) 21 22 ## Compiler switch to embed a runtime search path 23 LD_RPATH= 24 LD_RPATH_PRE= -Wl,-rpath, 25 26 ## Environment variable to set a runtime search path 27 LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH 28