]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: do not share compiler flags except for emitting warnings
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 8 Jun 2021 00:23:50 +0000 (09:23 +0900)
committerLennart Poettering <lennart@poettering.net>
Tue, 8 Jun 2021 08:44:34 +0000 (10:44 +0200)
Follow-up for 65267363978dbb298eb4ba9b628d028c969fa616.

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

meson.build
src/boot/efi/meson.build

index 8a83a4e268cf530bc6c23ff5e10a52503354320a..a90c9b89e591dd60c9323d9bf777dfe5cdbada45 100644 (file)
@@ -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')
index 06b2fe5d81c603d72df478a6a09bff860edcbb88..afdf739d9b7c0d190df1282aff0f13b378eb0601 100644 (file)
@@ -180,6 +180,7 @@ if have_gnu_efi
                 possible_common_cc_flags + [
                         '-ffreestanding',
                         '-fno-stack-protector',
+                        '-fno-strict-aliasing',
                         '-fpic',
                         '-fshort-wchar',
                         '-Wall',