luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Rename test_c_args to avoid confusion with gio tests c_args

Browse Source
This commit is contained in:
Xavier Claessens 2018-11-14 09:38:33 -05:00
parent b3c899d295
commit ba2c519819
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson.build
View File

@ -345,7 +345,7 @@ endforeach
# Compiler flags
if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
test_c_args = [
warning_c_args = [
'-Wall',
'-Wduplicated-branches',
'-Wimplicit-fallthrough',
@ -363,18 +363,18 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang'
'-Werror=missing-prototypes',
'-Werror=pointer-arith',
]
test_c_link_args = [
warning_c_link_args = [
'-Wl,-z,nodelete',
]
if get_option('bsymbolic_functions')
test_c_link_args += ['-Wl,-Bsymbolic-functions']
warning_c_link_args += ['-Wl,-Bsymbolic-functions']
endif
else
test_c_args = []
test_c_link_args = []
warning_c_args = []
warning_c_link_args = []
endif
add_project_arguments(cc.get_supported_arguments(test_c_args), language: 'c')
add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c')
# FIXME: We cannot build some of the GResource tests with -z nodelete, which
# means we cannot use that flag in add_project_link_arguments(), and must add
@ -382,7 +382,7 @@ add_project_arguments(cc.get_supported_arguments(test_c_args), language: 'c')
# because that is what the autotools build did.
# See https://github.com/mesonbuild/meson/pull/3520 for a way to eventually
# improve this.
glib_link_flags = cc.get_supported_link_arguments(test_c_link_args)
glib_link_flags = cc.get_supported_link_arguments(warning_c_link_args)
# Windows Support (7+)
if host_system == 'windows'