Merge pull request #192 from anholt/meson-bump

Require a newer version of Meson
macos/v1.5.9
Emmanuele Bassi 6 years ago committed by GitHub
commit 439e8b7867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      meson.build
  2. 6
      src/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()

@ -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

Loading…
Cancel
Save