From a590cfde0cf719c637b75e4784be0c0ae60e3b1f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 12 Jul 2022 15:22:30 +0200 Subject: compilers: Add optimization=plain option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/mesonbuild/meson/pull/9287 changed the `optimization=0` to pass `-O0` to the compiler. This change is reasonable by itself but unfortunately, it breaks `buildtype=plain`, which promises that “no extra build flags are used”. `buildtype=plain` is important for distros like NixOS, which manage compiler flags for optimization and hardening themselves. Let’s introduce a new optimization level that does nothing and set it as the default for `buildtype=plain`. --- mesonbuild/compilers/compilers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 725d394..ea03869 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -254,7 +254,8 @@ msvc_winlibs = ['kernel32.lib', 'user32.lib', 'gdi32.lib', 'winspool.lib', 'shell32.lib', 'ole32.lib', 'oleaut32.lib', 'uuid.lib', 'comdlg32.lib', 'advapi32.lib'] # type: T.List[str] -clike_optimization_args = {'0': [], +clike_optimization_args = {'plain': [], + '0': [], 'g': [], '1': ['-O1'], '2': ['-O2'], @@ -262,7 +263,8 @@ clike_optimization_args = {'0': [], 's': ['-Os'], } # type: T.Dict[str, T.List[str]] -cuda_optimization_args = {'0': [], +cuda_optimization_args = {'plain': [], + '0': [], 'g': ['-O0'], '1': ['-O1'], '2': ['-O2'], -- cgit v1.1