diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-01-10 10:29:11 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-10 12:31:44 +0100 |
| commit | 349861ceec4085fd1f0ff0af8bcf873aa15ba611 (patch) | |
| tree | 6543ad02add282e0c3c0a62d632d607f93659eaa /src/meson.build | |
| parent | ec016f6b43f4f7727944d67e358e7dc01ee2e42d (diff) | |
| download | NetworkManager-349861ceec4085fd1f0ff0af8bcf873aa15ba611.tar.gz | |
build/meson: unconditionally use linker version scripts
We also unconditionally use them with autotools.
Also, the detection for have_version_script does
not seem correct to me. At least, it didn't work
with clang.
Diffstat (limited to 'src/meson.build')
| -rw-r--r-- | src/meson.build | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/meson.build b/src/meson.build index df197bd28f..b3d7f333e0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -232,9 +232,7 @@ symbol_map = custom_target( command: [create_exports_networkmanager, '--called-from-make', '@INPUT@'] ) -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(symbol_map) -endif +ldflags += '-Wl,--version-script,@0@'.format(symbol_map) ''' network_manager = executable( @@ -257,10 +255,9 @@ deps = [ nm_core_dep ] -ldflags = [] -if have_version_script - ldflags += '-Wl,--version-script,@0@'.format(linker_script_binary) -endif +ldflags = [ + '-Wl,--version-script,@0@'.format(linker_script_binary), +] name = 'nm-iface-helper' |