From 90defd077ddabc919d488953cb24c86476afdf39 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 21 Mar 2018 11:03:23 +0100 Subject: Fix bug 696910 in a different way. The strdup function is not part of the strict C++ standard. Use gnu++0x instead of c++0x when building Harfbuzz, which uses this function. --- Makerules | 3 --- Makethird | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makerules b/Makerules index 33cfe902..635f4ab6 100644 --- a/Makerules +++ b/Makerules @@ -71,9 +71,6 @@ ifeq "$(OS)" "MINGW" WINDRES := windres HAVE_X11 ?= no HAVE_WIN32 := yes -CC=gcc -# Add flags required for Harfbuzz because of missing strdup -CFLAGS+= -U__STRICT_ANSI__ # Mac OS X doesn't have pkg-config so we hard code paths. else ifeq "$(OS)" "MACOS" diff --git a/Makethird b/Makethird index ba3fbaa5..0e250d60 100644 --- a/Makethird +++ b/Makethird @@ -168,7 +168,7 @@ $(HARFBUZZ_OUT)/%.o: $(HARFBUZZ_DIR)/src/%.cc | $(HARFBUZZ_OUT) $(CXX_CMD) -DHAVE_OT -DHAVE_UCDN -DHB_NO_MT $(FREETYPE_CFLAGS) \ -Dhb_malloc_impl=fz_hb_malloc -Dhb_calloc_impl=fz_hb_calloc \ -Dhb_free_impl=fz_hb_free -Dhb_realloc_impl=fz_hb_realloc \ - -fno-rtti -fno-exceptions -fvisibility-inlines-hidden --std=c++0x + -fno-rtti -fno-exceptions -fvisibility-inlines-hidden --std=gnu++0x HARFBUZZ_CFLAGS := -I$(HARFBUZZ_DIR)/src else -- cgit v1.2.3