Kaydet (Commit) 922cff77 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Let's use only comprehensive UDKAPI headers for Clang on OS X

Change-Id: Ie5969a0f5772676f91c29fe946217d8d31bf514a
üst 97593ae2
......@@ -278,9 +278,28 @@ endef
# harm, by accident or careful design, on platforms where shared
# libraries are used.)
# We are experimenting with static linking on Android, too. There for
# technical reasons to get around silly limitations in the OS, sigh.
ifeq ($(DISABLE_DYNLOADING),TRUE)
gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE
endif
# 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.
ifeq ($(OS),MACOSX)
ifeq ($(COM_GCC_IS_CLANG),TRUE)
gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive = TRUE
endif
endif
$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
$(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
$(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \
$(call gb_Output_announce,$*,$(true),HPB,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \
\
......@@ -295,7 +314,7 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \
$(call gb_UnoApiHeadersTarget_get_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
$(if $(filter TRUEudkapi,$(DISABLE_DYNLOADING)$*), \
$(if $(filter TRUEudkapi,$(gb_UnoApiHeadersTarget_UDKAPI_always_comprehensive)$*), \
$(call gb_Output_announce,$*,$(true),HPP,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-C), \
\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment