[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/Makefile.am        |   13 +++++--------
 src/check-libstdc++.sh |    3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 42040a273facc696d9a54fc4d89857665e87e3d1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Feb 12 18:41:36 2018 -0800

    Allow libharfbuzz-subset to link to libstdc++
    
    We want to use it instead of reinventing hashmap...
    
    Also, don't change linker for ICU since libicu also uses libstdc++.

diff --git a/src/Makefile.am b/src/Makefile.am
index e7731e84..6f56c758 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,6 @@ pkgconfig_DATA = harfbuzz.pc
 EXTRA_DIST += harfbuzz.pc.in
 
 lib_LTLIBRARIES += libharfbuzz-subset.la
-libharfbuzz_subset_la_LINK = $(chosen_linker) $(libharfbuzz_subset_la_LDFLAGS)
 libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources)
 libharfbuzz_subset_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS)
 libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset)
@@ -192,7 +191,6 @@ HBSOURCES += $(HB_ICU_sources)
 HBHEADERS += $(HB_ICU_headers)
 else
 lib_LTLIBRARIES += libharfbuzz-icu.la
-libharfbuzz_icu_la_LINK = $(chosen_linker) $(libharfbuzz_icu_la_LDFLAGS)
 libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources)
 libharfbuzz_icu_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS) $(ICU_CFLAGS)
 libharfbuzz_icu_la_LDFLAGS = $(base_link_flags) $(export_symbols_icu)
diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh
index a7b4c495..ce0bdab7 100755
--- a/src/check-libstdc++.sh
+++ b/src/check-libstdc++.sh
@@ -22,7 +22,8 @@ fi
 
 tested=false
 # harfbuzz-icu links to libstdc++ because icu does.
-for soname in harfbuzz harfbuzz-subset harfbuzz-gobject; do
+# harfbuzz-subset uses libstdc++.
+for soname in harfbuzz harfbuzz-gobject; do
 	for suffix in so dylib; do
 		so=$libs/lib$soname.$suffix
 		if ! test -f "$so"; then continue; fi
commit 4af3c5e25822cc5a401837da547c75a17b7f7b48
Author: Ebrahim Byagowi <ebrahim at gnu.org>
Date:   Mon Feb 12 23:21:24 2018 +0330

    Move linker specifying to a better place

diff --git a/src/Makefile.am b/src/Makefile.am
index 7b7ccdef..e7731e84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,25 +126,22 @@ export_symbols_icu = -export-symbols harfbuzz-icu.def
 harfbuzz_icu_def_dependency = harfbuzz-icu.def
 export_symbols_subset = -export-symbols harfbuzz-subset.def
 harfbuzz_subset_def_dependency = harfbuzz-subset.def
-choosed_linker = $(CXXLINK)
+chosen_linker = $(CXXLINK)
 else
 if WITH_LIBSTDCXX
-choosed_linker = $(CXXLINK)
+chosen_linker = $(CXXLINK)
 else
 if HAVE_GCC
 # Use a C linker for GCC, not C++; Don't link to libstdc++
-choosed_linker = $(LINK)
+chosen_linker = $(LINK)
 else
-choosed_linker = $(CXXLINK)
+chosen_linker = $(CXXLINK)
 endif
 endif
 endif
 
-libharfbuzz_la_LINK = $(choosed_linker) $(libharfbuzz_la_LDFLAGS)
-libharfbuzz_icu_la_LINK = $(choosed_linker) $(libharfbuzz_icu_la_LDFLAGS)
-libharfbuzz_subset_la_LINK = $(choosed_linker) $(libharfbuzz_subset_la_LDFLAGS)
-
 base_link_flags = $(AM_LDFLAGS) -lm -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined
+libharfbuzz_la_LINK = $(chosen_linker) $(libharfbuzz_la_LDFLAGS)
 libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS)
 libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)
 libharfbuzz_la_LDFLAGS = $(base_link_flags) $(export_symbols)
@@ -157,6 +154,7 @@ pkgconfig_DATA = harfbuzz.pc
 EXTRA_DIST += harfbuzz.pc.in
 
 lib_LTLIBRARIES += libharfbuzz-subset.la
+libharfbuzz_subset_la_LINK = $(chosen_linker) $(libharfbuzz_subset_la_LDFLAGS)
 libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources)
 libharfbuzz_subset_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS)
 libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset)
@@ -194,6 +192,7 @@ HBSOURCES += $(HB_ICU_sources)
 HBHEADERS += $(HB_ICU_headers)
 else
 lib_LTLIBRARIES += libharfbuzz-icu.la
+libharfbuzz_icu_la_LINK = $(chosen_linker) $(libharfbuzz_icu_la_LDFLAGS)
 libharfbuzz_icu_la_SOURCES = $(HB_ICU_sources)
 libharfbuzz_icu_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS) $(ICU_CFLAGS)
 libharfbuzz_icu_la_LDFLAGS = $(base_link_flags) $(export_symbols_icu)