From ec0bbbd2a994979992b2e9dcde7b97e89ccf5b31 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 5 Jul 2025 20:21:00 +0100 Subject: [PATCH] meson: do not reference variable unless feature that defines it is enabled SYSTEMD_LANGUAGE_FALLBACK_MAP is used by the localed test, and language_fallback_map is defined by the localed meson. If the feature is disabled, the test is not built so the env var is not needed, and the meson variable is not defined so the build fails. --- src/test/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/meson.build b/src/test/meson.build index 286fcac5c7..e99605af72 100644 --- a/src/test/meson.build +++ b/src/test/meson.build @@ -12,7 +12,9 @@ generated_sources += test_hashmap_ordered_c path = run_command(sh, '-c', 'echo "$PATH"', check: true).stdout().strip() test_env = environment() -test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) +if conf.get('ENABLE_LOCALED') == 1 + test_env.set('SYSTEMD_LANGUAGE_FALLBACK_MAP', language_fallback_map) +endif test_env.set('PATH', meson.project_build_root() + ':' + path) test_env.set('PROJECT_BUILD_ROOT', meson.project_build_root()) test_env.set('SYSTEMD_SLOW_TESTS', want_slow_tests ? '1' : '0')