Disable tools/choose-default-locale.sh when cross compiling

This commit is contained in:
James Hilliard 2019-01-05 11:28:59 +08:00 committed by Lennart Poettering
parent d27d60b3bc
commit 50f2fc77d7

View File

@ -834,8 +834,12 @@ substs.set('NTP_SERVERS', ntp_servers)
default_locale = get_option('default-locale') default_locale = get_option('default-locale')
if default_locale == '' if default_locale == ''
choose_default_locale_sh = find_program('tools/choose-default-locale.sh') if not meson.is_cross_build()
default_locale = run_command(choose_default_locale_sh).stdout().strip() 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 endif
conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale) conf.set_quoted('SYSTEMD_DEFAULT_LOCALE', default_locale)