From 965c5bf7fbf5b5140fdfa3b39efb8e484d72fddb Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 18 Aug 2019 04:35:04 +0300 Subject: meson: Define _FORTIFY_SOURCE for optimised builds _FORTIFY_SOURCE adds useful checks during compilation. The option is enabled by default by gcc on all non-optimised builds (as it requires -O1 or higher). Enable it explicitly for clang. Signed-off-by: Laurent Pinchart Acked-by: Kieran Bingham --- meson.build | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 13d0605f..5201a2f5 100644 --- a/meson.build +++ b/meson.build @@ -38,12 +38,22 @@ common_arguments = [ c_arguments = common_arguments cpp_arguments = common_arguments -# Use libc++ by default if available instead of libstdc++ when compiling with -# clang. -if cc.get_id() == 'clang' and cc.find_library('libc++', required: false).found() - cpp_arguments += [ - '-stdlib=libc++', - ] +if cc.get_id() == 'clang' + # 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. + if get_option('optimization') != '0' + common_arguments += [ + '-D_FORTIFY_SOURCE=2', + ] + endif + + # Use libc++ by default if available instead of libstdc++ when compiling + # with clang. + if cc.find_library('libc++', required: false).found() + cpp_arguments += [ + '-stdlib=libc++', + ] + endif endif add_project_arguments(c_arguments, language : 'c') -- cgit v1.2.1