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

meson: Don't set _FORTIFY_SOURCE for ChromeOS

Browse source 
ChromeOS is moving to a platform default of `_FORTIFY_SOURCE=3`, and
this definition conflicts with that:

<command line>:4:9: error: '_FORTIFY_SOURCE' macro redefined
[-Werror,-Wmacro-redefined]

Rather than adding logic to keep up with their local configuration, it
seems best to leave setting _FORTIFY_SOURCE on ChromeOS up to ChromeOS.

Signed-off-by: George Burgess IV <gbiv@google.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
George Burgess IV 2023-09-11 17:09:07 -06:00 • committed by Laurent Pinchart
parent 90e0fea6c6
commit 9c5eb9237c
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
meson.build
View file

@ -99,12 +99,26 @@ if cc.get_id() == 'clang'
error('clang version is too old, libcamera requires 9.0 or newer')
endif
# Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1
# or higher). This is needed on clang only as gcc enables it by default.
# Turn _FORTIFY_SOURCE by default on. This is needed on clang only as gcc
# enables it by default. FORTIFY will not work properly with `-O0`, and may
# 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.
if get_option('optimization') != '0'
common_arguments += [
'-D_FORTIFY_SOURCE=2',
]
has_fortify_define = false
# Assume that if the user requests a FORTIFY level in cpp_args, they
# do the same for c_args.
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 += [
'-D_FORTIFY_SOURCE=2',
]
endif
endif
# Use libc++ by default if available instead of libstdc++ when compiling