diff options
author | Thomas Haller <thaller@redhat.com> | 2018-01-11 12:34:40 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-01-11 12:46:01 +0100 |
commit | 34cb6f9877a9b7a7032899dbccca1def88da4191 (patch) | |
tree | e36cd40bbde4ae06d9f4225d3fb7b3ec7f115c20 /src/meson.build | |
parent | 98b46537fa1a91941b5f7a8252b3fce85554a855 (diff) | |
download | NetworkManager-34cb6f9877a9b7a7032899dbccca1def88da4191.tar.gz |
build/meson: use variables for ldflags and linker-script
Diffstat (limited to 'src/meson.build')
-rw-r--r-- | src/meson.build | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/meson.build b/src/meson.build index b3d7f333e0..db17bf1555 100644 --- a/src/meson.build +++ b/src/meson.build @@ -223,7 +223,7 @@ create_exports_networkmanager = join_paths(meson.source_root(), 'tools', 'create symbol_map_name = 'NetworkManager.ver' -symbol_map = custom_target( +linker_script = custom_target( symbol_map_name, input: meson.source_root(), output: symbol_map_name, @@ -232,7 +232,7 @@ symbol_map = custom_target( command: [create_exports_networkmanager, '--called-from-make', '@INPUT@'] ) -ldflags += '-Wl,--version-script,@0@'.format(symbol_map) +ldflags += '-Wl,--version-script,@0@'.format(linker_script) ''' network_manager = executable( @@ -242,7 +242,8 @@ network_manager = executable( c_args: cflags, link_with: libnetwork_manager, link_args: ldflags, - link_depends: symbol_map, + #FIXME + #link_depends: linker_script, install: true, install_dir: nm_sbindir ) @@ -255,10 +256,6 @@ deps = [ nm_core_dep ] -ldflags = [ - '-Wl,--version-script,@0@'.format(linker_script_binary), -] - name = 'nm-iface-helper' executable( @@ -267,7 +264,7 @@ executable( dependencies: deps, c_args: cflags, link_with: [libnetwork_manager_base, libsystemd_nm], - link_args: ldflags, + link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, install_dir: nm_libexecdir |