diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 10:25:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-20 10:26:24 +0300 |
| commit | 90fc5593a44f41489719bc882db21813416f80da (patch) | |
| tree | 5de908bfe732514c13612bd5c16060c9ef441498 /liborcus/ExternalProject_liborcus.mk | |
| parent | 7e871bbaf7b208dd884528259211385b8074da39 (diff) | |
Revert "Pass also gb_CXXFLAGS to the liborcus configury"
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.
Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.
This reverts commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a.
This reverts commit 7e871bbaf7b208dd884528259211385b8074da39.
This reverts commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46.
This reverts commit bed5557e8bdfe5c698a45a4cc82619a7c22de001.
Diffstat (limited to 'liborcus/ExternalProject_liborcus.mk')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 9691c6037a07..f67b48c64063 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --without-libzip \ --disable-debug \ --disable-spreadsheet-model \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(OUTDIR)/inc/external) $(gb_CXXFLAGS)" \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(GNUMAKE) \ && touch $@ |