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

[Vincent LE GARREC (via logerrit)]

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

New commits:
commit b371f746d7b48826121665bbec207fcbcf4f0a44
Author:     Vincent LE GARREC <libreoffice at le-garrec.fr>
AuthorDate: Wed Feb 24 21:08:11 2021 +0100
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Mar 2 13:40:15 2021 +0100

    Build libvisio with user CXXFLAGS
    
    Related with commit 8ae9d4727d8010a8f5d51f76ff0ebc5f88f0709f
    
    Change-Id: Ic38585f5f5ea5a633a67026d2640e0c43ea43f2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111503
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Jenkins

diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 0911fcd87c7c..ea2f09688fff 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
-			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+			CXXFLAGS="$(CXXFLAGS) $(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) \