summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2020-01-03 13:55:24 +0200
committerTor Lillqvist <tml@collabora.com>2020-01-03 17:53:00 +0100
commit50b5f0a3cb864f5e58429946098a80235fa528fa (patch)
treeb988baaea8303923eedc9a0675b69ff745e23a0e /lingucomponent
parent3f5a4c8cf2e24f5da8319ff43d0b7da431ef6cc0 (diff)
Use only the 'MacOSXSpell' component on iOS, not the 'spell' one
Using only the system spell checker (through MacOSXSpell) is what we have been doing anyway. Do not build the hunspell or mythes externals for iOS. Do not build the lnth or spell components for iOS. Change-Id: I2e2abc268d7719e540072e5daff3f7960e04ed27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86172 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86174 Tested-by: Jenkins
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/Library_MacOSXSpell.mk1
-rw-r--r--lingucomponent/Module_lingucomponent.mk4
2 files changed, 2 insertions, 3 deletions
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index f244673a1c4c..d49ee47a73bd 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\
$(eval $(call gb_Library_use_externals,MacOSXSpell,\
boost_headers \
- hunspell \
))
$(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
index 2bde5d5391e5..9dabeb155673 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -13,9 +13,9 @@ $(eval $(call gb_Module_Module,lingucomponent))
$(eval $(call gb_Module_add_targets,lingucomponent,\
Library_guesslang \
Library_hyphen \
- Library_lnth \
+ $(if $(filter-out iOS,$(OS)),Library_lnth) \
$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
- Library_spell \
+ $(if $(filter-out iOS,$(OS)),Library_spell) \
StaticLibrary_ulingu \
Library_numbertext \
))