[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/30] meson: support meson 0.64 -Doptimization=plain
From: |
Paolo Bonzini |
Subject: |
[PATCH 07/30] meson: support meson 0.64 -Doptimization=plain |
Date: |
Fri, 9 Dec 2022 12:23:46 +0100 |
In Meson 0.64, the optimization built-in option now accepts the "plain" value,
which will not set any optimization flags. While QEMU does not check the
contents of the option and therefore does not suffer any ill effect
from the new value, it uses get_option to print the optimization flags
in the summary. Clean the code up to remove duplication, and check for
-Doptimization=plain at the same time.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/meson.build b/meson.build
index d61c7a82f112..dbd0b5563446 100644
--- a/meson.build
+++ b/meson.build
@@ -3752,18 +3752,16 @@ endif
if targetos == 'darwin'
summary_info += {'Objective-C compiler': '
'.join(meson.get_compiler('objc').cmd_array())}
endif
-summary_info += {'CFLAGS': ' '.join(get_option('c_args')
- + ['-O' +
get_option('optimization')]
- + (get_option('debug') ? ['-g']
: []))}
+option_cflags = (get_option('debug') ? ['-g'] : [])
+if get_option('optimization') != 'plain'
+ option_cflags += ['-O' + get_option('optimization')]
+endif
+summary_info += {'CFLAGS': ' '.join(get_option('c_args') +
option_cflags)}
if link_language == 'cpp'
- summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args')
- + ['-O' +
get_option('optimization')]
- + (get_option('debug') ? ['-g']
: []))}
+ summary_info += {'CXXFLAGS': ' '.join(get_option('cpp_args') +
option_cflags)}
endif
if targetos == 'darwin'
- summary_info += {'OBJCFLAGS': ' '.join(get_option('objc_args')
- + ['-O' +
get_option('optimization')]
- + (get_option('debug') ? ['-g']
: []))}
+ summary_info += {'OBJCFLAGS': ' '.join(get_option('objc_args') +
option_cflags)}
endif
link_args = get_option(link_language + '_link_args')
if link_args.length() > 0
--
2.38.1
- [PATCH 08/30] meson: require 0.63.0, (continued)
- [PATCH 08/30] meson: require 0.63.0, Paolo Bonzini, 2022/12/09
- [PATCH 01/30] configure: remove useless write_c_skeleton, Paolo Bonzini, 2022/12/09
- [PATCH 16/30] build: move glib detection and workarounds to meson, Paolo Bonzini, 2022/12/09
- [PATCH 11/30] meson: cleanup dummy-cpus.c rules, Paolo Bonzini, 2022/12/09
- [PATCH 07/30] meson: support meson 0.64 -Doptimization=plain,
Paolo Bonzini <=
- [PATCH 09/30] meson: use prefer_static option, Paolo Bonzini, 2022/12/09
- [PATCH 06/30] meson: tweak hardening options for Windows, Paolo Bonzini, 2022/12/09
- [PATCH 14/30] configure: test all warnings, Paolo Bonzini, 2022/12/09