Merge pull request #11337 from keszybz/build-version-h

meson: declare version.h as dep for libbasic

diff --git a/meson.build b/meson.build
index 93e78ef57ce93a792844ea98ecec77f812403221..c23d2b821f39d1e86fa56036144c2d2d4e3509bb 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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)