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

David Tardon dtardon at redhat.com
Sat Oct 28 17:20:53 UTC 2017


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

New commits:
commit 6eecca40aa77de90e3566645f812be5cf3b416d0
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 28 16:01:06 2017 +0200

    BOOST_CPPFLAGS is already set correctly by configure
    
    Change-Id: I5c3b87352fad9fff42075a81e921c03e1dcb7bdc
    Reviewed-on: https://gerrit.libreoffice.org/44000
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk
index a2d18e93768e..164e01cef43f 100644
--- a/external/libqxp/ExternalProject_libqxp.mk
+++ b/external/libqxp/ExternalProject_libqxp.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) :
 			--disable-werror \
 			--disable-weffc \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+			CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(BOOST_CPPFLAGS)" \
 			REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
 			ax_cv_cxx_compile_cxx11=yes \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \


More information about the Libreoffice-commits mailing list