diff options
| author | David Tardon <dtardon@redhat.com> | 2015-09-17 20:36:40 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 21:58:47 +0200 |
| commit | e7b15e556ca462f85678753f43e17769ffded244 (patch) | |
| tree | dcdcb49c496793c09d2b01ab6b508bbfa8fe187a /external | |
| parent | c4eed408dd2e949a54741a2f6d02dbe341fff77f (diff) | |
pass user-set CXXFLAGS
Change-Id: I1b4f0f3e7f5a7092f904fc8de59bb704073ed7db
(cherry picked from commit 8e8ad3f697c4caf0e48edf0953e706625fba47bb)
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 2 |
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)) \ |