From 84b8d257e490a29dbc2d439971fa0aa3669c8bbb Mon Sep 17 00:00:00 2001 From: Benjamin Redelings Date: Sat, 7 Oct 2023 10:37:49 -0400 Subject: [PATCH] Allow c++23 in gcc-11. --- mesonbuild/compilers/cpp.py | 2 +- unittests/linuxliketests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index ba7539c6f..dc733dd9e 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -426,7 +426,7 @@ class GnuCPPCompiler(_StdCPPLibMixin, GnuCompiler, CPPCompiler): 'c++98', 'c++03', 'c++11', 'c++14', 'c++17', 'c++1z', 'c++2a', 'c++20', ] - if version_compare(self.version, '>=12.2.0'): + if version_compare(self.version, '>=11.0.0'): cppstd_choices.append('c++23') if version_compare(self.version, '>=14.0.0'): cppstd_choices.append('c++26') diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 7d99d8bf5..024d4338a 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -520,10 +520,10 @@ class LinuxlikeTests(BasePlatformTests): compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=10.0.0')) has_cpp2b = (compiler.get_id() not in {'clang', 'gcc'} or compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=12.0.0', None) or - compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=12.2.0')) + compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=11.0.0')) has_cpp23 = (compiler.get_id() not in {'clang', 'gcc'} or compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=17.0.0', None) or - compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=12.2.0')) + compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=11.0.0')) has_cpp26 = (compiler.get_id() not in {'clang', 'gcc'} or compiler.get_id() == 'clang' and _clang_at_least(compiler, '>=17.0.0', None) or compiler.get_id() == 'gcc' and version_compare(compiler.version, '>=14.0.0'))