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

[David Tardon]

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

New commits:
commit d0625cb6cb3035bbb9508c50fbcf035ac64e4c56
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 10:50:37 2017 +0200

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

diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index cd6c547eae6c..f23bc50e8b04 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -36,7 +36,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 			--disable-werror \
 			--disable-weffc \
 			$(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) \
 	)