diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-02-17 11:55:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-02-17 11:57:50 +0100 |
| commit | be9bf4801bc157ec1bf522500772222de914a212 (patch) | |
| tree | 2c4e241459089ee803b1e11e21ed2d3b5a32e7cb /libvisio | |
| parent | faf72664d11deaa570a0f8c7e702ff07bf5914c8 (diff) | |
Improve support for --with-system-boost --with-boost=... in external modules
...though it would arguably be better to just pass along --with-boost=... where
applicable. (liborcus' orcus-xml-dump links against -lboost_system, so needs
BOOST_LDFLAGS passed in in addition to BOOST_CPPFLAGS.)
Change-Id: I6467d0f453d68494b75559a7eb61f865f9513b50
Diffstat (limited to 'libvisio')
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index c133158d343f..deee4995cbff 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --without-docs \ --disable-debug \ --disable-werror \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ |