diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-30 11:42:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-31 10:03:38 +0300 |
| commit | 21ce2a53e518e2e20c7736ef48f978d1e3c1d28b (patch) | |
| tree | c64826de0332f1703713c990e97aa1dd96b709d1 /solenv | |
| parent | e1b61b2dafd8e84c60f5ae0eebf04165ea55d353 (diff) | |
For iOS always generate comprehensive headers for udkapi
Seems to get rid of one bootstrapping problem, where URE types are
needed before their rdb file has been read.
Change-Id: If9ae2f282dee06841a538ff1983bb3e836aa5706
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 7e44d06110eb..3c84bd3a040a 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -288,10 +288,25 @@ define gb_UnoApiHeadersTarget__command endef +# On iOS we use static linking because dynamic loading of own code +# isn't allowed by the iOS App Store rules, and we want our code to be +# eventually distributable there as part of apps. + +# To avoid problems that this causes together with the lovely +# intentional breaking of the One Definition Rule, for iOS we always +# generate comprehensive headers for udkapi. (The ODR breakage doesn't +# harm, by accident or careful design, on platforms where shared +# libraries are used.) + $(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(call gb_Output_announce,$*,$(true),HPB,3) - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) + $(if $(filter IOSudkapi,$(OS)$*), \ + $(call gb_Output_announce,$*,$(true),HPB,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*),-C), \ + \ + $(call gb_Output_announce,$*,$(true),HPB,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) \ + ) $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) @@ -300,8 +315,13 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \ $(call gb_UnoApiHeadersTarget_get_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET) - $(call gb_Output_announce,$*,$(true),HPP,3) - $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) + $(if $(filter IOSudkapi,$(OS)$*), \ + $(call gb_Output_announce,$*,$(true),HPP,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-C), \ + \ + $(call gb_Output_announce,$*,$(true),HPP,3) \ + $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) \ + ) .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) $(call gb_UnoApiHeadersTarget_get_clean_target,%) : |