diff options
| author | Ting-Wei Lan <lantw@src.gnome.org> | 2018-04-28 21:08:39 +0800 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2018-05-24 15:55:58 +0100 |
| commit | 10905a83b5b9cd6b9b8b12b40a4ed47bc51ab33a (patch) | |
| tree | c6f8d0ecb15df2eba77f6701d8d1ab0406316126 | |
| parent | de5f23c7d5a1e12d831e85c0764060304be6014f (diff) | |
| download | colord-10905a83b5b9cd6b9b8b12b40a4ed47bc51ab33a.tar.gz | |
build: Fix linker argument checks
Fixes: https://github.com/hughsie/colord/issues/69
| -rw-r--r-- | contrib/ci/Dockerfile-fedora | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ci/Dockerfile-fedora b/contrib/ci/Dockerfile-fedora index f9a8db1..284be25 100644 --- a/contrib/ci/Dockerfile-fedora +++ b/contrib/ci/Dockerfile-fedora @@ -1,4 +1,4 @@ -FROM fedora:26 +FROM fedora:28 RUN dnf -y update RUN dnf -y install \ diff --git a/meson.build b/meson.build index 8a5b927..c3b5188 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('colord', 'c', version : '1.4.4', license : 'LGPL-2.1+', - meson_version : '>=0.37.0', + meson_version : '>=0.46.0', default_options : ['c_std=c99'] ) @@ -99,7 +99,7 @@ test_link_args = [ '-Wl,-z,now', ] foreach arg: test_link_args - if cc.has_argument(arg) + if cc.has_link_argument(arg) global_link_args += arg endif endforeach |