未验证 提交 109314cb 编写于 作者: E Ebrahim Byagowi 提交者: GitHub

Another attempt on fixing the tests on Travis (#788)

上级 694eaf63
...@@ -37,7 +37,7 @@ HBNOLIBCXXCFLAGS = ...@@ -37,7 +37,7 @@ HBNOLIBCXXCFLAGS =
else else
# Make sure we don't link to libstdc++ # Make sure we don't link to libstdc++
# No threadsafe statics in C++ as we do it ourselves # 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 HBLIBCXXFLAGS = -fno-threadsafe-statics
endif endif
...@@ -158,7 +158,7 @@ EXTRA_DIST += harfbuzz.pc.in ...@@ -158,7 +158,7 @@ EXTRA_DIST += harfbuzz.pc.in
lib_LTLIBRARIES += libharfbuzz-subset.la lib_LTLIBRARIES += libharfbuzz-subset.la
libharfbuzz_subset_la_SOURCES = $(HB_SUBSET_sources) 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_LDFLAGS = $(base_link_flags) $(export_symbols_subset)
libharfbuzz_subset_la_LIBADD = libharfbuzz.la libharfbuzz_subset_la_LIBADD = libharfbuzz.la
EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency) EXTRA_libharfbuzz_subset_la_DEPENDENCIES = $(harfbuzz_subset_def_dependency)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册