diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-10-04 22:54:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 22:54:36 +0200 |
| commit | 439e8b7867c78251bb4efc2fd510c5125e3ed2fb (patch) | |
| tree | b0f49edc1106948d18f7c2f8d99dfa931ddd8037 | |
| parent | f69fa3a3d411ce57be62317791876e8b373ef10f (diff) | |
| parent | bf531d104299f5074a6f22cc353221cc7c7708fa (diff) | |
| download | libepoxy-439e8b7867c78251bb4efc2fd510c5125e3ed2fb.tar.gz | |
Merge pull request #192 from anholt/meson-bump
Require a newer version of Meson
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 640f17c..e95de48 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('libepoxy', 'c', version: '1.5.3', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.44.0') + meson_version: '>= 0.47.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() diff --git a/src/meson.build b/src/meson.build index 466fc0d..fe092d1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -50,11 +50,7 @@ epoxy_sources = sources + gen_sources common_ldflags = [] if host_system == 'linux' and cc.get_id() == 'gcc' - if meson.version().version_compare('>= 0.46.0') - common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ]) - else - common_ldflags += [ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro', ] - endif + common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ]) endif # Maintain compatibility with autotools; see: https://github.com/anholt/libepoxy/issues/108 |