summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-22 23:09:40 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-22 23:13:07 +0300
commit8774a2b1279fcb43eb3cf821cadd3b969078cbcd (patch)
tree7a0289eddeddea55a57ffb46dfb8eef97426ba62 /solenv
parentf8fd4b70717ee2fc9a3b3f25ebf9e1b6a91a7a25 (diff)
Let --with-locales prune also built-in collator data
Effective in the DISABLE_DYNLOADING case. Introduce a new gbuild macro gb_Helper_optional_locale. Change-Id: I43eb39fa810f71cadb6bc6d5c117ae145629ecb9
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Helper.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4b9c249ac451..8efba9834ba1 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -242,6 +242,16 @@ define gb_Helper_optional
$(if $(filter $(1),$(BUILD_TYPE)),$(2))
endef
+ifeq ($(WITH_LOCALES),)
+define gb_Helper_optional_locale
+$(2)
+endef
+else
+define gb_Helper_optional_locale
+$(if $(filter $(1) $(1)_%,$(WITH_LOCALES)),$(2))
+endef
+endif
+
define gb_Helper_optional_for_host
$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
endef