Skip to content

Commit 439e8b7

Browse files
authored
Merge pull request #192 from anholt/meson-bump
Require a newer version of Meson
2 parents f69fa3a + bf531d1 commit 439e8b7

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project('libepoxy', 'c', version: '1.5.3',
55
'warning_level=1',
66
],
77
license: 'MIT',
8-
meson_version: '>= 0.44.0')
8+
meson_version: '>= 0.47.0')
99

1010
epoxy_version = meson.project_version().split('.')
1111
epoxy_major_version = epoxy_version[0].to_int()

src/meson.build

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ epoxy_sources = sources + gen_sources
5050
common_ldflags = []
5151

5252
if host_system == 'linux' and cc.get_id() == 'gcc'
53-
if meson.version().version_compare('>= 0.46.0')
54-
common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ])
55-
else
56-
common_ldflags += [ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro', ]
57-
endif
53+
common_ldflags += cc.get_supported_link_arguments([ '-Wl,-Bsymbolic-functions', '-Wl,-z,relro' ])
5854
endif
5955

6056
# Maintain compatibility with autotools; see: https://github.com/anholt/libepoxy/issues/108

0 commit comments

Comments
 (0)