external/libfreehand/ExternalProject_libfreehand.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2a8c66adfffe3074f0433d44e3b6899c58b54db6
Author: David Tardon <dtar...@redhat.com>
Date: Sat Oct 28 15:31:34 2017 +0200
libfreehand: pass optimization flags to configure
Change-Id: Idef9d938ef3f4067530041142e64e191dcbfff51
Reviewed-on: https://gerrit.libreoffice.org/43994
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk
b/external/libfreehand/ExternalProject_libfreehand.mk
index f1640bb88e03..19d3f0e3afd9 100644
--- a/external/libfreehand/ExternalProject_libfreehand.mk
+++ b/external/libfreehand/ExternalProject_libfreehand.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\
$(call gb_ExternalProject_get_state_target,libfreehand,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
- && export CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE)" \
&& MAKE=$(MAKE) ./configure \
--with-pic \
--enable-static \
@@ -38,7 +37,8 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build)
:
--disable-werror \
--disable-weffc \
$(if
$(verbose),--disable-silent-rules,--enable-silent-rules) \
- CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
+ CXXFLAGS="$(gb_CXXFLAGS) $(if
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)
$(ICU_UCHAR_TYPE)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
