summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-28 13:07:19 +0300
committerTor Lillqvist <tml@iki.fi>2012-09-29 07:45:22 +0300
commit0919d45d514642ed6cc62fe20227a99295a09d40 (patch)
treef40c67bf6a49d57d156da7071fdc754b9570379f /solenv
parent398ce44c54b26b31eb826c150926fd49e59b4f52 (diff)
Workaround for boost problem with the 10.7 SDK
Change-Id: I970326f084ef20fc9887e62adf95547c2468aebd
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index f1b6666cc482..1aad554722ba 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -75,6 +75,14 @@ gb_COMPILERDEFS += \
endif
+# Without this I get struct/class clashes for "complex" when compiling
+# some source files in vcl, at least with the 10.7 SDK.
+ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),)
+gb_COMPILERDEFS += \
+ -DBOOST_DETAIL_NO_CONTAINER_FWD \
+
+endif
+
ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
gb_CXXFLAGS += -Wno-long-double
endif