diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-02 12:57:39 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-02 13:01:04 -0500 |
| commit | d79bdca7e472c25973388daafdae34d49e393180 (patch) | |
| tree | e7a30a41d66d15d19d73bb84cbce1b0da5934d74 /liborcus | |
| parent | 5b272379dbfb27875c1fbeed98d71699c8beaec7 (diff) | |
fix build on android with gcc 4.7
See https://code.google.com/p/android/issues/detail?id=41770
Change-Id: I555c1e9b8b15afd78b07b1c7b12a0b37d1112f9a
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 7b1230203881..e9326483ba75 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -67,7 +67,9 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --disable-spreadsheet-model \ --disable-werror \ $(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \ - $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS) LDFLAGS=$(BOOST_LDFLAGS)) \ + CXXFLAGS="$(BOOST_CXXFLAGS) $(if $(filter NO,$(SYSTEM_BOOST)),\ + -I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ + $(if $(filter YES,$(SYSTEM_BOOST)),LDFLAGS=$(BOOST_LDFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) |