[eog: 7/21] build: Add proper linker support check
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog: 7/21] build: Add proper linker support check
- Date: Mon, 15 Jul 2019 19:30:16 +0000 (UTC)
commit 9a6780bb1c9db9eb539104f846b17122a90de30c
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Jun 27 22:17:21 2019 +0200
build: Add proper linker support check
Since meson 0.46[0], meson has added support for checking properly
link flags support. `version-script` link flag check has been
changed to take advantage of this support.
[0] http://mesonbuild.com/Release-notes-for-0-46-0.html#new-functions-has_link_argument-and-friends
meson.build | 3 ---
src/meson.build | 6 +-----
2 files changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3a529917..02497e6a 100644
--- a/meson.build
+++ b/meson.build
@@ -81,9 +81,6 @@ endif
add_project_arguments(common_flags + compiler_flags, language: 'c')
-ldflag = '-Wl,--version-script'
-have_version_script = host_machine.system().contains('linux') and cc.has_argument(ldflag)
-
glib_req_version = '>= 2.53.4'
peas_req_version = '>= 0.7.4'
diff --git a/src/meson.build b/src/meson.build
index 12645470..857277c9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -140,11 +140,7 @@ cflags = [
]
symbol_map = meson.current_source_dir() / 'symbol.map'
-
-ldflags = []
-if have_version_script
- ldflags += '-Wl,--version-script,@0@'.format(symbol_map)
-endif
+ldflags = cc.get_supported_link_arguments('-Wl,--version-script,' + symbol_map)
if enable_introspection
deps += gir_dep
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]