From 8e8ad3f697c4caf0e48edf0953e706625fba47bb Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 17 Sep 2015 20:36:40 +0200 Subject: pass user-set CXXFLAGS Change-Id: I1b4f0f3e7f5a7092f904fc8de59bb704073ed7db --- 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 38a25bcddaf9..bd93be4f2f3f 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -57,7 +57,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:="$(CXXFLAGS_CXX11) \ +icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \ $(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(debug),$(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS)) \ $(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \ -- cgit v1.2.3