[Libreoffice-commits] core.git: external/libqxp

[David Tardon]

 external/libqxp/ExternalProject_libqxp.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9ea8686d3573540b697b51d1e2e00bfe2d57d872
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 16:01:22 2017 +0200

    libqxp: pass optimization flags to configure
    
    Change-Id: I16586e206bef696023a124fb69b28c1bd92d0cff
    Reviewed-on: https://gerrit.libreoffice.org/44001
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk
index 164e01cef43f..d9e43727e6ed 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -34,7 +34,8 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
 			--disable-werror \
 			--disable-weffc \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(BOOST_CPPFLAGS)" \
+			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
 			ax_cv_cxx_compile_cxx11=yes \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \