diff options
| author | Biswapriyo Nath <nathbappai@gmail.com> | 2021-07-26 01:53:35 +0530 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2021-07-27 16:28:12 +0100 |
| commit | 60e85d47255a5a4423f4411532ff16554470a4dc (patch) | |
| tree | 16a4a1afcacf42c2cc42a3513ce05c081d7382f0 | |
| parent | eb07872499376334e8efa51cd319afc947ccbc9e (diff) | |
| download | appstream-glib-60e85d47255a5a4423f4411532ff16554470a4dc.tar.gz | |
meson: Check --version-script linker option before using.
mingw clang does not support --version-script linker option.
| -rw-r--r-- | libappstream-glib/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libappstream-glib/meson.build b/libappstream-glib/meson.build index 715123d..89a007e 100644 --- a/libappstream-glib/meson.build +++ b/libappstream-glib/meson.build @@ -138,7 +138,9 @@ if platform_osx mapfile = 'appstream-glib.map.osx-clang' vflag = '-Wl,-exported_symbols_list,@0@/@1@'.format(meson.current_source_dir(), mapfile) else - vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) + vflag = cc.get_supported_link_arguments([ + '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile), + ]) endif asglib = shared_library( diff --git a/meson.build b/meson.build index 15b0c51..46becb4 100644 --- a/meson.build +++ b/meson.build @@ -2,9 +2,11 @@ project('appstream-glib', 'c', version : '0.7.19', license : 'LGPL-2.1+', default_options : ['warning_level=1', 'c_std=c99'], - meson_version : '>=0.37.0' + meson_version : '>=0.46.0' ) +cc = meson.get_compiler('c') + as_version = meson.project_version() varr = as_version.split('.') as_major_version = varr[0] @@ -105,7 +107,6 @@ endif # support stemming of search tokens if get_option('stemmer') - cc = meson.get_compiler('c') stemmer = cc.find_library('stemmer') conf.set('HAVE_LIBSTEMMER', 1) endif |