summaryrefslogtreecommitdiffstats
path: root/external/librevenge
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-09-17 20:01:30 +0200
committerDavid Tardon <dtardon@redhat.com>2015-09-17 20:02:12 +0200
commitf5d753201d3e2464b2a750de46ca2cfb8cc7a4a7 (patch)
tree4d0c5dd1262208a6d79d8aa491878a432b6a3349 /external/librevenge
parentrevert for mac and win unit case crashes after boost->std (diff)
downloadcore-f5d753201d3e2464b2a750de46ca2cfb8cc7a4a7.tar.gz
core-f5d753201d3e2464b2a750de46ca2cfb8cc7a4a7.zip
blind attempt to fix lcov
Change-Id: If8d6c8da1be1e540d641f20ac90e7877feae27be
Diffstat (limited to 'external/librevenge')
-rw-r--r--external/librevenge/ExternalProject_librevenge.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 1ca5797c564e..9a7efe135c0f 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--disable-generators \
--without-docs \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \