external/icu/ExternalProject_icu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 8e8ad3f697c4caf0e48edf0953e706625fba47bb Author: David Tardon <[email protected]> Date: Thu Sep 17 20:36:40 2015 +0200 pass user-set CXXFLAGS Change-Id: I1b4f0f3e7f5a7092f904fc8de59bb704073ed7db diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 38a25bc..bd93be4 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)) \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
