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

[David Tardon]

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

New commits:
commit e4b9c41107fb8a78580b19fbe103448bf98680df
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 16:18:02 2017 +0200

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

diff --git a/external/libstaroffice/ExternalProject_libstaroffice.mk b/external/libstaroffice/ExternalProject_libstaroffice.mk
index 28c4f47becd5..3f6c19e2879f 100644
--- a/external/libstaroffice/ExternalProject_libstaroffice.mk
+++ b/external/libstaroffice/ExternalProject_libstaroffice.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libstaroffice,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
 			--disable-werror \
-			CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11)" \
+			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \