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

[David Tardon]

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

New commits:
commit cd13490334e9817514028381f1bd57ee67770bc2
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 16:19:47 2017 +0200

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

diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index da34277cbf9e..53a87d1c0025 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \
+			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+			CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \
 	)