From a500ab2ee19a5221817c13fc8975c27fe4e92246 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 13 Nov 2013 17:03:06 +0100 Subject: [PATCH] Tunnel CXXFLAGS_CXX11 into ICU for our -D__float128=void hack for Clang against libstdc++; it is OK that that explicitly enables C++11 for ICU, as ICU's configure.ac would set -std=c++0x if no -std= is passed in. Change-Id: I0e5044773c3d6923e3b100e19b5b54ab9edf7a1b --- external/icu/ExternalProject_icu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 26d90b5337f8..bc56ce814a77 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -56,7 +56,7 @@ icu_CFLAGS:=" \ $(if $(filter GCC,$(COM)),-fno-strict-aliasing) \ $(if $(filter $(true),$(gb_SYMBOL)),-g) \ $(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)" -icu_CXXFLAGS:=" \ +icu_CXXFLAGS:="$(CXXFLAGS_CXX11) \ $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \