From 6741d0eaa97beec36a4cc0d5f1c07ddfaab437cb Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 12 May 2022 09:53:11 -0700 Subject: [PATCH] Now gnu11 is the default, bump experimental to gnu17. Bug: http://b/232413369 Test: treehugger Change-Id: I8a2b1eef744c219811c32ad46688437a1ba3f21e --- bp2build/cc_library_conversion_test.go | 6 +++--- cc/config/global.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go index 2775a104e..ab9298116 100644 --- a/bp2build/cc_library_conversion_test.go +++ b/bp2build/cc_library_conversion_test.go @@ -1914,9 +1914,9 @@ func TestCcLibraryCppStdWithGnuExtensions_ConvertsToFeatureAttr(t *testing.T) { {cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17"}, // some c_std test cases - {c_std: "experimental", gnu_extensions: "", bazel_c_std: "gnu11"}, - {c_std: "experimental", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c11"}, - {c_std: "experimental", gnu_extensions: "true", bazel_c_std: "gnu11"}, + {c_std: "experimental", gnu_extensions: "", bazel_c_std: "gnu17"}, + {c_std: "experimental", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c17"}, + {c_std: "experimental", gnu_extensions: "true", bazel_c_std: "gnu17"}, {c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "", bazel_cpp_std: "gnu++17", bazel_c_std: "gnu11"}, {c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c11"}, {c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17", bazel_c_std: "gnu11"}, diff --git a/cc/config/global.go b/cc/config/global.go index 2f00cfa8f..1c4ad7f6a 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -281,7 +281,7 @@ var ( CStdVersion = "gnu11" CppStdVersion = "gnu++17" - ExperimentalCStdVersion = "gnu11" + ExperimentalCStdVersion = "gnu17" ExperimentalCppStdVersion = "gnu++2a" // prebuilts/clang default settings.