michael@0: Bug 915735 - Fix linking the ICU libraries on Mac michael@0: michael@0: diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin michael@0: index 97d6bfc..fe1490e 100644 michael@0: --- a/intl/icu/source/config/mh-darwin michael@0: +++ b/intl/icu/source/config/mh-darwin michael@0: @@ -23,21 +23,17 @@ ARFLAGS += -c michael@0: COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c michael@0: COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c michael@0: michael@0: ## Commands to make a shared library michael@0: SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) michael@0: SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) michael@0: michael@0: ## Compiler switches to embed a library name and version information michael@0: -ifeq ($(ENABLE_RPATH),YES) michael@0: -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) michael@0: -else michael@0: -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) michael@0: -endif michael@0: +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)) michael@0: michael@0: ## Compiler switch to embed a runtime search path michael@0: LD_RPATH= michael@0: LD_RPATH_PRE= -Wl,-rpath, michael@0: michael@0: ## Environment variable to set a runtime search path michael@0: LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH michael@0: