From ec016f6b43f4f7727944d67e358e7dc01ee2e42d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 10 Jan 2018 10:15:58 +0100 Subject: [PATCH] build/meson: fix build without have_version_script We always need to declare the linker_script_* variables, because they are used (unconditionally) as a dependency, even without have_version_script. --- meson.build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 6d29dfa3e..8fb9d92ff 100644 --- a/meson.build +++ b/meson.build @@ -168,11 +168,9 @@ add_project_link_arguments(common_ldflags, language: 'c') ldflag = '-Wl,--version-script' have_version_script = host_machine.system().contains('linux') and cc.has_argument(ldflag) -if have_version_script - linker_script_binary = join_paths(meson.source_root(), 'linker-script-binary.ver') - linker_script_devices = join_paths(meson.source_root(), 'linker-script-devices.ver') - linker_script_settings = join_paths(meson.source_root(), 'linker-script-settings.ver') -endif +linker_script_binary = join_paths(meson.source_root(), 'linker-script-binary.ver') +linker_script_devices = join_paths(meson.source_root(), 'linker-script-devices.ver') +linker_script_settings = join_paths(meson.source_root(), 'linker-script-settings.ver') uuid_dep = dependency('uuid') libelogind_dep = dependency('libelogind', version: '>= 219', required: false)