Skip to content

Commit 33f0df4

Browse files
bredelingsnirbheek
authored andcommitted
Allow c++23 in gcc-11.
1 parent 002982b commit 33f0df4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mesonbuild/compilers/cpp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def get_options(self) -> 'MutableKeyedOptionDictType':
421421
'c++2a', 'c++20', 'gnu++03', 'gnu++11', 'gnu++14', 'gnu++17',
422422
'gnu++1z', 'gnu++2a', 'gnu++20',
423423
]
424-
if version_compare(self.version, '>=12.2.0'):
424+
if version_compare(self.version, '>=11.0.0'):
425425
cppstd_choices.append('c++23')
426426
cppstd_choices.append('gnu++23')
427427
opts[key].choices = cppstd_choices

unittests/linuxliketests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,10 @@ def _test_stds_impl(self, testdir: str, compiler: 'Compiler') -> None:
519519
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=10.0.0'))
520520
has_cpp2b = (compiler.get_id() not in {'clang', 'gcc'} or
521521
compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=12.0.0', None) or
522-
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=12.2.0'))
522+
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=11.0.0'))
523523
has_cpp23 = (compiler.get_id() not in {'clang', 'gcc'} or
524524
compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=17.0.0', None) or
525-
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=12.2.0'))
525+
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=11.0.0'))
526526
has_c18 = (compiler.get_id() not in {'clang', 'gcc'} or
527527
compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=8.0.0', '>=11.0') or
528528
compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=8.0.0'))

0 commit comments

Comments
 (0)