intl/icu-patches/bug-915735@fc2d59ddac77
intl/icu-patches/bug-915735
Wed, 31 Dec 2014 07:22:50 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 31 Dec 2014 07:22:50 +0100
- branch
- TOR_BUG_3246
- changeset 4
- fc2d59ddac77
- permissions
- -rw-r--r--
Correct previous dual key logic pending first delivery installment.
1 Bug 915735 - Fix linking the ICU libraries on Mac
3 diff --git a/intl/icu/source/config/mh-darwin b/intl/icu/source/config/mh-darwin
4 index 97d6bfc..fe1490e 100644
5 --- a/intl/icu/source/config/mh-darwin
6 +++ b/intl/icu/source/config/mh-darwin
7 @@ -23,21 +23,17 @@ ARFLAGS += -c
8 COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -fno-common -c
9 COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -fno-common -c
11 ## Commands to make a shared library
12 SHLIB.c= $(CC) -dynamiclib -dynamic $(CFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
13 SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
15 ## Compiler switches to embed a library name and version information
16 -ifeq ($(ENABLE_RPATH),YES)
17 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
18 -else
19 -LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
20 -endif
21 +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))
23 ## Compiler switch to embed a runtime search path
24 LD_RPATH=
25 LD_RPATH_PRE= -Wl,-rpath,
27 ## Environment variable to set a runtime search path
28 LDLIBRARYPATH_ENVVAR = DYLD_LIBRARY_PATH
