summaryrefslogtreecommitdiff
path: root/external/icu
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-09-17 20:36:40 +0200
committerDavid Tardon <dtardon@redhat.com>2015-09-17 20:36:40 +0200
commit8e8ad3f697c4caf0e48edf0953e706625fba47bb (patch)
treed540fbce5595d600b4b77b57dfd910f7189a7bb2 /external/icu
parentf5d753201d3e2464b2a750de46ca2cfb8cc7a4a7 (diff)
pass user-set CXXFLAGS
Change-Id: I1b4f0f3e7f5a7092f904fc8de59bb704073ed7db
Diffstat (limited to 'external/icu')
-rw-r--r--external/icu/ExternalProject_icu.mk2
1 files changed, 1 insertions, 1 deletions
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)) \