summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-10-20 17:49:17 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-10-20 17:54:13 +0200
commitb70df91abfc94a6ec7870204f3c30191c313f4a5 (patch)
treed0f0af5ffd5bb9d8d40b3799517cc14b21ebb47c /solenv
parent685570fbde82b482a46c5d07e0b7deed1daf5ed1 (diff)
Whatever the assertion failures in saxparser when doing i18npool...
...actually were, I cannot reproduce any problems at least with recent Xcode 5.0 on Mac OS X 10.8. Maybe the real problem was addressed meanwhile with 254f59f623f58c320175a06a2c93bcee7868b623 "rhbz#1014010: Missing dependencies in isBootstrapType list." Change-Id: I24a920c12f70feef670f0988a6f69c26033789fd
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/platform/macosx.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 670d6250d44d..e5e9d13effb4 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -357,11 +357,7 @@ gb_UnpackedTarget_TARFILE_LOCATION := $(TARFILE_LOCATION)
# UnoApiHeadersTarget class
-# It seems that when using the latest Xcode and Clang for OS X, we
-# also neeed to always generate comprehensive headers for
-# udkapi. Otherwise we get assertion failures in saxparser when doing
-# i18npool, at least.
-ifneq ($(filter TRUE,$(COM_GCC_IS_CLANG) $(DISABLE_DYNLOADING)),)
+ifneq ($(filter TRUE,$(DISABLE_DYNLOADING)),)
gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2))
else
gb_UnoApiHeadersTarget_select_variant = $(2)