From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 8 Jun 2021 00:23:50 +0000 (+0900)
Subject: meson: do not share compiler flags except for emitting warnings
X-Git-Tag: v249-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16e09d51a7f5f688d5b699806f6f092f590d2e0d;p=thirdparty%2Fsystemd.git

meson: do not share compiler flags except for emitting warnings

Follow-up for 65267363978dbb298eb4ba9b628d028c969fa616.

Prompted by https://github.com/systemd/systemd/issues/19191#issuecomment-856312107.
---

diff --git a/meson.build b/meson.build
index 8a83a4e268c..a90c9b89e59 100644
--- a/meson.build
+++ b/meson.build
@@ -355,13 +355,6 @@ possible_common_cc_flags = [
         # negative arguments are correctly detected starting with meson 0.46.
         '-Wno-error=#warnings',  # clang
         '-Wno-string-plus-int',  # clang
-
-        '-ffast-math',
-        '-fno-common',
-        '-fdiagnostics-show-option',
-        '-fno-strict-aliasing',
-        '-fvisibility=hidden',
-        '--param=ssp-buffer-size=4',
 ]
 
 # Disable -Wmaybe-unitialized when compiling with -Os/-O1/-O3/etc. There are
@@ -388,8 +381,21 @@ if cc.get_id() == 'clang'
         ]
 endif
 
+possible_cc_flags = possible_common_cc_flags + [
+        '-Werror=missing-declarations',
+        '-Werror=missing-prototypes',
+        '-fdiagnostics-show-option',
+        '-ffast-math',
+        '-fno-common',
+        '-fno-strict-aliasing',
+        '-fstack-protector',
+        '-fstack-protector-strong',
+        '-fvisibility=hidden',
+        '--param=ssp-buffer-size=4',
+]
+
 if get_option('buildtype') != 'debug'
-        possible_common_cc_flags += [
+        possible_cc_flags += [
                 '-ffunction-sections',
                 '-fdata-sections',
         ]
@@ -397,13 +403,6 @@ if get_option('buildtype') != 'debug'
         possible_link_flags += '-Wl,--gc-sections'
 endif
 
-possible_cc_flags = possible_common_cc_flags + [
-        '-Werror=missing-declarations',
-        '-Werror=missing-prototypes',
-        '-fstack-protector',
-        '-fstack-protector-strong',
-]
-
 add_project_arguments(cc.get_supported_arguments(basic_disabled_warnings), language : 'c')
 add_project_arguments(cc.get_supported_arguments(possible_cc_flags), language : 'c')
 add_project_link_arguments(cc.get_supported_link_arguments(possible_link_flags), language : 'c')
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 06b2fe5d81c..afdf739d9b7 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -180,6 +180,7 @@ if have_gnu_efi
                 possible_common_cc_flags + [
                         '-ffreestanding',
                         '-fno-stack-protector',
+                        '-fno-strict-aliasing',
                         '-fpic',
                         '-fshort-wchar',
                         '-Wall',