From 91f0d51f0525097fef6173046379a89414cb515f Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Mon, 12 Feb 2018 17:20:12 +0330 Subject: [PATCH] =?UTF-8?q?Fix=20symbol=20exporting=20issue=20on=20msys2?= =?UTF-8?q?=20and=20=E2=9C=85=20bringing=20all=20the=20bots=20(#781)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Makefile.am | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 48e633200..257285636 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -126,20 +126,24 @@ 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 -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +choosed_linker = $(CXXLINK) else if WITHSTDCPP -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +choosed_linker = $(CXXLINK) else if HAVE_GCC # Use a C linker for GCC, not C++; Don't link to libstdc++ -libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) +choosed_linker = $(LINK) else -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +choosed_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_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) @@ -153,7 +157,6 @@ pkgconfig_DATA = harfbuzz.pc EXTRA_DIST += harfbuzz.pc.in lib_LTLIBRARIES += libharfbuzz-subset.la -libharfbuzz_subset_la_LINK = $(libharfbuzz_la_LINK) libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources) libharfbuzz_subset_la_CPPFLAGS = $(libharfbuzz_la_CPPFLAGS) libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset) @@ -191,7 +194,6 @@ HBSOURCES += $(HB_ICU_sources) HBHEADERS += $(HB_ICU_headers) else lib_LTLIBRARIES += libharfbuzz-icu.la -libharfbuzz_icu_la_LINK = $(libharfbuzz_la_LINK) 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)