From 8e92da60341cbc882cf310f04f0d15862763a888 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 6 Dec 2018 15:31:13 +0100 Subject: Typo causing external/libnumbertext to always use $(gb_COMPILERNOOPTFLAGS) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ...ever since f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 "tdf#117171 support localized number name numbering styles" Change-Id: I93dcfa9f1310b35e3068a7e0efdce258364a7d78 Reviewed-on: https://gerrit.libreoffice.org/64720 Reviewed-by: László Németh Tested-by: László Németh Tested-by: Jenkins (cherry picked from commit 82af7584dcfe78b2242b3611bc00375871093189) Reviewed-on: https://gerrit.libreoffice.org/64743 Reviewed-by: Stephan Bergmann --- external/libnumbertext/ExternalProject_libnumbertext.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external') diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index 2b899c63d132..b12012e16577 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build): $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ $(if $(libnumbertext_CPPFLAGS),CPPFLAGS='$(libnumbertext_CPPFLAGS)') \ - CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED) $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ + CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CXXFLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ && cd src && $(MAKE) \ ) -- cgit v1.2.3