Merge branch 'master' into 'master'

meson.build: fix build without stack-protector

See merge request GNOME/sysprof!42
This commit is contained in:
Christian Hergert
2020-11-25 16:58:59 +00:00

View File

@ -140,10 +140,6 @@ else
test_c_args += ['-Werror=incompatible-pointer-types']
endif
if get_option('buildtype') != 'plain'
test_c_args += '-fstack-protector-strong'
endif
foreach arg: test_c_args
if cc.has_multi_arguments(arg)
global_c_args += arg
@ -158,6 +154,11 @@ test_link_args = [
'-Wl,-z,relro',
'-Wl,-z,now',
]
if get_option('buildtype') != 'plain'
test_link_args += '-fstack-protector-strong'
endif
if not get_option('buildtype').startswith('debug')
release_flags += [
'-DG_DISABLE_CAST_CHECKS',