walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add --with-stdcpp for ossfuzzer and mupdf use (#770)

This commit is contained in:
Ebrahim Byagowi 2018-02-12 12:00:07 +03:30 committed by GitHub
parent 82e04758c8
commit 2efc896550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -57,6 +57,12 @@ m4_define([hb_libtool_current],
HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age
AC_SUBST(HB_LIBTOOL_VERSION_INFO) AC_SUBST(HB_LIBTOOL_VERSION_INFO)
AC_ARG_WITH([stdcpp],
[AS_HELP_STRING([--with-stdcpp],
[Do not try suppressing linkage to libstdcpp])],,
[with_stdcpp=no])
AM_CONDITIONAL(WITHSTDCPP, [test "x$with_stdcpp" = "xyes"])
# Documentation # Documentation
have_gtk_doc=false have_gtk_doc=false
m4_ifdef([GTK_DOC_CHECK], [ m4_ifdef([GTK_DOC_CHECK], [
@ -80,12 +86,6 @@ if test "x$GCC" = "xyes"; then
# Make symbols link locally # Make symbols link locally
LDFLAGS="$LDFLAGS -Bsymbolic-functions" LDFLAGS="$LDFLAGS -Bsymbolic-functions"
# Make sure we don't link to libstdc++
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
# No threadsafe statics and C++ as we do it ourselves
CXXFLAGS="$CXXFLAGS -fno-threadsafe-statics"
# Assorted warnings # Assorted warnings
CXXFLAGS="$CXXFLAGS -Wcast-align" CXXFLAGS="$CXXFLAGS -Wcast-align"

14
src/Makefile.am
View File

@ -30,6 +30,14 @@ HBSOURCES += $(HB_BASE_RAGEL_GENERATED_sources)
HBHEADERS = $(HB_BASE_headers) HBHEADERS = $(HB_BASE_headers)
HBNODISTHEADERS = $(HB_NODIST_headers) HBNODISTHEADERS = $(HB_NODIST_headers)
if !WITHSTDCPP
# Make sure we don't link to libstdc++
HBCFLAGS += -fno-rtti -fno-exceptions
# No threadsafe statics and C++ as we do it ourselves
HBCFLAGS += -fno-threadsafe-statics
endif
if HAVE_OT if HAVE_OT
HBSOURCES += $(HB_OT_sources) HBSOURCES += $(HB_OT_sources)
HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources) HBSOURCES += $(HB_OT_RAGEL_GENERATED_sources)
@ -116,13 +124,17 @@ export_symbols = -export-symbols harfbuzz.def
harfbuzz_def_dependency = harfbuzz.def harfbuzz_def_dependency = harfbuzz.def
libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
else else
# Use a C linker for GCC, not C++; Don't link to libstdc++ if WITHSTDCPP
libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
else
if HAVE_GCC if HAVE_GCC
# Use a C linker for GCC, not C++; Don't link to libstdc++
libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS)
else else
libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS)
endif endif
endif endif
endif
libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS)
libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)