[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/macosx.mk |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit b70df91abfc94a6ec7870204f3c30191c313f4a5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Oct 20 17:49:17 2013 +0200

    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

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 670d625..e5e9d13 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)