]> granicus.if.org Git - icu/commitdiff
ICU-20563 fix macosx rpath breakage in the data build release-64-2
authorSteven R. Loomis <srloomis@us.ibm.com>
Wed, 17 Apr 2019 15:58:08 +0000 (08:58 -0700)
committerSteven R. Loomis <srl295@gmail.com>
Wed, 17 Apr 2019 19:03:05 +0000 (12:03 -0700)
- in the rpath case, we do NOT want a trailing space in LD_SONAME

regression was introduced in ICU-20526 with
 83a0542b5b52a30b7af736f5ef6b0405f6582867 (master)
 b76cb6517efa113739a3ffadda7ff024db0d5689 (in maint-64)

(cherry picked from commit 1c553b9cf28d25c0aaf961c5f587f4ad3cee2679)

icu4c/source/config/mh-darwin

index dc708f617487ebe5260caaf064b2d9a526c30f89..7b15709c860b40cc65c30a7fdababdaf7ba7e411 100644 (file)
@@ -31,7 +31,7 @@ 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)) $(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))
 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)
 endif