fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 14:00:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/meson: fix build without have_version_script

Browse source 
We always need to declare the linker_script_* variables, because they
are used (unconditionally) as a dependency, even without have_version_script.
This commit is contained in:
Thomas Haller 2018-01-10 10:15:58 +01:00
parent 3d7aa8483e
commit ec016f6b43
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -168,11 +168,9 @@ add_project_link_arguments(common_ldflags, language: 'c')
ldflag = '-Wl,--version-script' ldflag = '-Wl,--version-script'
have_version_script = host_machine.system().contains('linux') and cc.has_argument(ldflag) 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_binary = join_paths(meson.source_root(), 'linker-script-binary.ver') linker_script_devices = join_paths(meson.source_root(), 'linker-script-devices.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')
linker_script_settings = join_paths(meson.source_root(), 'linker-script-settings.ver')
endif
uuid_dep = dependency('uuid') uuid_dep = dependency('uuid')
libelogind_dep = dependency('libelogind', version: '>= 219', required: false) libelogind_dep = dependency('libelogind', version: '>= 219', required: false)