diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2024-07-21 03:52:07 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2024-07-21 23:07:46 +0300 |
| commit | bc56a2c3469def7fafbdb38da6691cccb171e739 (patch) | |
| tree | 6a0e8ae3a19e5d79cf4091a998c57ae25955cec5 /mesonbuild/compilers | |
| parent | d587fb587d2d32963a7b5f6dfe45895a5e1e6076 (diff) | |
| download | meson-bc56a2c3469def7fafbdb38da6691cccb171e739.tar.gz | |
compilers: fix partial refactor of coredata options
Fallout from the OptionStore refactor, and specifically commit
9a6fcd4d9a0c7bb248c5d0587632b741a3301e03. The `std` object was migrated
from having an option itself, to having the value fetched and saved
directly. In most cases, this also meant avoiding `.value`, but in a
couple cases this refactor went overlooked, and crashed at runtime.
Only affects Elbrus and Intel C++ compilers, seemingly.
Fixes #13401
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 1f0952455..f9ebf08da 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -622,8 +622,8 @@ class ElbrusCPPCompiler(ElbrusCompiler, CPPCompiler): args: T.List[str] = [] key = self.form_compileropt_key('std') std = options.get_value(key) - if std.value != 'none': - args.append(self._find_best_cpp_std(std.value)) + if std != 'none': + args.append(self._find_best_cpp_std(std)) key = self.form_compileropt_key('eh') non_msvc_eh_options(options.get_value(key), args) @@ -699,7 +699,7 @@ class IntelCPPCompiler(IntelGnuLikeCompiler, CPPCompiler): 'c++03': 'c++98', 'gnu++03': 'gnu++98' } - args.append('-std=' + remap_cpp03.get(std.value, std)) + args.append('-std=' + remap_cpp03.get(std, std)) if options.get_value(key.evolve('eh')) == 'none': args.append('-fno-exceptions') if not options.get_value(key.evolve('rtti')): |