]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Disable tools/choose-default-locale.sh when cross compiling
authorJames Hilliard <james.hilliard1@gmail.com>
Sat, 5 Jan 2019 03:28:59 +0000 (11:28 +0800)
committerLennart Poettering <lennart@poettering.net>
Sun, 6 Jan 2019 12:51:18 +0000 (13:51 +0100)
meson.build

index 5dd105f09769895fa7872a5a68a28082aca7e9b0..2a530654708f027f851304838a2fb7ad2ba6941b 100644 (file)
@@ -834,8 +834,12 @@ substs.set('NTP_SERVERS', ntp_servers)
 
 default_locale = get_option('default-locale')
 if default_locale == ''
-        choose_default_locale_sh = find_program('tools/choose-default-locale.sh')
-        default_locale = run_command(choose_default_locale_sh).stdout().strip()
+        if not meson.is_cross_build()
+                choose_default_locale_sh = find_program('tools/choose-default-locale.sh')
+                default_locale = run_command(choose_default_locale_sh).stdout().strip()
+        else
+                default_locale = 'C.UTF-8'
+        endif
 endif
 conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)