diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-14 21:37:58 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 21:39:24 +0100 |
| commit | d5d307d647c67c2d620eae5651c54c02178b5f52 (patch) | |
| tree | e3e5a025ae00789cb859bcae3c171ab5343e2608 | |
| parent | 1b5f5b0325e8ace49da154c0275d3d6894acc809 (diff) | |
externals using boost now need config_host to find config_global.h
... why didn't GCC 4.1 have #pragma diagnostic push?
Change-Id: Iedb33d6451e46dc12e137bcd4dccd592c7771c23
| -rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 2 | ||||
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index dbb7d2b87dfa..0983177af75b 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \ XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \ XML_LIBS="$(LIBXML_LIBS)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index e8ebf000f9d6..171ea5981c83 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -53,7 +53,7 @@ liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif # patched boost needs to find config_global.h ifeq ($(SYSTEM_BOOST),NO) -liborcus_CPPFLAGS += -I$(SRCDIR)/config_$(gb_Side) +liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side) endif # # OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index 5af9deda7052..abfd006d056f 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --without-docs \ --disable-debug \ --disable-werror \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && \ $(if $(VERBOSE)$(verbose),V=1) \ |