From b68b86daf1a8478b86aeae44a8c39a606ed873cb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 18 Dec 2012 20:39:40 -0500 Subject: [PATCH] Use C++ linker if ICU is disabled Bug 54948 - Undefined symbols: "operator delete(void*)" "operator new(unsigned long)" "___cxa_pure_virtual" --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index b7896bf9c..558ce08ea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -195,9 +195,13 @@ export_symbols = -export-symbols harfbuzz.def harfbuzz_def_dependency = harfbuzz.def libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) else +if HAVE_ICU +libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) +else # Use a C linker, not C++; Don't link to libstdc++ libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) endif +endif libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)