src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit d594f947b68ad36d32ce107847f5f02ec3528076 Author: Behdad Esfahbod <beh...@behdad.org> Date: Wed Feb 14 10:55:25 2018 -0800 [subset] Allow linking to libstdc++ We want to use it. diff --git a/src/Makefile.am b/src/Makefile.am index 3b18ebd3..a451acff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -158,7 +158,7 @@ EXTRA_DIST += harfbuzz.pc.in lib_LTLIBRARIES += libharfbuzz-subset.la libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources) -libharfbuzz_subset_la_CPPFLAGS = $(HBCFLAGS) $(HBNOLIBCXXFLAGS) +libharfbuzz_subset_la_CPPFLAGS = $(HBCFLAGS) $(HBLIBCXXFLAGS) libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset) libharfbuzz_subset_la_LIBADD = libharfbuzz.la EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency) commit 109314cb55e6d95d5c3a87b9ed1ba4e74a880078 Author: Ebrahim Byagowi <ebra...@gnu.org> Date: Wed Feb 14 21:05:11 2018 +0330 Another attempt on fixing the tests on Travis (#788) diff --git a/src/Makefile.am b/src/Makefile.am index 1ccd8438..3b18ebd3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,7 +37,7 @@ HBNOLIBCXXCFLAGS = else # Make sure we don't link to libstdc++ # No threadsafe statics in C++ as we do it ourselves -HBNOLIBCXXFLAGS = -fno-rtti -fno-exceptions +HBNOLIBCXXFLAGS = -fno-threadsafe-statics -fno-rtti -fno-exceptions HBLIBCXXFLAGS = -fno-threadsafe-statics endif @@ -158,7 +158,7 @@ EXTRA_DIST += harfbuzz.pc.in lib_LTLIBRARIES += libharfbuzz-subset.la libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources) -libharfbuzz_subset_la_CPPFLAGS = $(HBCFLAGS) +libharfbuzz_subset_la_CPPFLAGS = $(HBCFLAGS) $(HBNOLIBCXXFLAGS) libharfbuzz_subset_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset) libharfbuzz_subset_la_LIBADD = libharfbuzz.la EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency) _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz