diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 10:15:58 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-10 12:30:48 +0100 |
| commit | ec016f6b43f4f7727944d67e358e7dc01ee2e42d (patch) | |
| tree | 6d53a42307e840d20b3ec622bdb0da0597f5cf1d | |
| parent | 3d7aa8483ecbcda97b25edf147461ed5cca49492 (diff) | |
| download | NetworkManager-ec016f6b43f4f7727944d67e358e7dc01ee2e42d.tar.gz | |
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.
| -rw-r--r-- | meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 6d29dfa3ee..8fb9d92ff3 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) |