NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Simplify check for _FORTIFY_SOURCE

Browse source 
Use the compiler.get_define() function to get the value of
_FORTIFY_SOURCE instead of iterating over the cpp_args. This simplies
the code, but also guarantees to return the actual value of
_FORTIFY_SOURCE, even if defined through other means than through the
meson cpp_args.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: George Burgess IV <gbiv@google.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2023-09-19 16:39:43 +03:00 • committed by Jacopo Mondi
parent dbe4e0e945
commit 1d61614142
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
meson.build
View file

@ -104,17 +104,9 @@ if cc.get_id() == 'clang'
# result in macro redefinition errors if the user already has a setting for # result in macro redefinition errors if the user already has a setting for
# `-D_FORTIFY_SOURCE`. Do not enable FORTIFY in either of those cases. # `-D_FORTIFY_SOURCE`. Do not enable FORTIFY in either of those cases.
if get_option('optimization') != '0' if get_option('optimization') != '0'
has_fortify_define = false fortify = cc.get_define('_FORTIFY_SOURCE')
# Assume that if the user requests a FORTIFY level in cpp_args, they if fortify == ''
# do the same for c_args. message('Adding _FORTIFY_SOURCE')
foreach flag : get_option('cpp_args')
if flag == '-U_FORTIFY_SOURCE'
has_fortify_define = false
elif flag.startswith('-D_FORTIFY_SOURCE=')
has_fortify_define = true
endif
endforeach
if not has_fortify_define
common_arguments += [ common_arguments += [
'-D_FORTIFY_SOURCE=2', '-D_FORTIFY_SOURCE=2',
] ]