[Libreoffice-commits] .: liborcus/ExternalProject_liborcus.mk

Wed Sep 19 22:31:07 PDT 2012

liborcus/ExternalProject_liborcus.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Sep 20 08:27:48 2012 +0300

    Pass also gb_CXXFLAGS to the liborcus configury
    
    Fixes its build with Xcode 3 against the 10.4 SDK, at least for me...
    
    Change-Id: Icaa792286477212cc3734c3fe02c9c1496d2e1f1

diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index f67b48c..9691c60 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 \
-		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \
+		CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(OUTDIR)/inc/external) $(gb_CXXFLAGS)" \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& $(GNUMAKE) \
 	&& touch $@
