summaryrefslogtreecommitdiff
path: root/sal/Module_sal.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-24 18:26:59 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-24 19:44:10 +0300
commit25d88d2b8eebb4782a016e03aa8562ad9fa15b7b (patch)
tree30b5cafa05573f31b9d044e314c170610310667d /sal/Module_sal.mk
parent95711f5b9e7b6a982d1762d37d5a38e0f40b86f9 (diff)
More hacking on --with-locales
Propagate the restriction of locales into <config_locales.h>. Note that in the normal case, with no locale restrictions, all the WITH_LOCALE_xx macros are zero anyway, but WITH_LOCALE_ALL is one. Restrict which character encodings are handled in sal/textencsal/textenc/tables.cxx based on the WITH_LOCALE_ macros. (Don't simply always do it for iOS.) Massage the affected unit tests to not crash when only partial character encoding information is present. Change-Id: Ie2c882c262ebd0d2b37dde66b8fe3c3e2570da14
Diffstat (limited to 'sal/Module_sal.mk')
-rw-r--r--sal/Module_sal.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 922bf5b75141..ef5d58f91eeb 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -54,8 +54,8 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_rtl_oustringbuffer \
CppunitTest_sal_rtl_oustring \
CppunitTest_sal_rtl_textenc \
- CppunitTest_sal_rtl_strings \
CppunitTest_sal_rtl_uri \
+ CppunitTest_sal_rtl_strings \
CppunitTest_sal_rtl_uuid \
CppunitTest_sal_tcwf \
CppunitTest_sal_types \