Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51cb2d93 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Now gnu11 is the default, bump experimental to gnu17."

parents 1c87db50 6741d0ea

bp2build/cc_library_conversion_test.go

+3 −3
Original line number Original line Diff line number Diff line
@@ -1914,9 +1914,9 @@ func TestCcLibraryCppStdWithGnuExtensions_ConvertsToFeatureAttr(t *testing.T) { 
		{cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17"},

		{cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17"},





		// some c_std test cases

		// some c_std test cases

		{c_std: "experimental", gnu_extensions: "", 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: "c11"},

		{c_std: "experimental", gnu_extensions: "false", bazel_cpp_std: "c++17", bazel_c_std: "c17"},

		{c_std: "experimental", gnu_extensions: "true", bazel_c_std: "gnu11"},

		{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: "", 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: "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"},

		{c_std: "gnu11", cpp_std: "gnu++17", gnu_extensions: "true", bazel_cpp_std: "gnu++17", bazel_c_std: "gnu11"},

cc/config/global.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -281,7 +281,7 @@ var ( 




	CStdVersion               = "gnu11"

	CStdVersion               = "gnu11"

	CppStdVersion             = "gnu++17"

	CppStdVersion             = "gnu++17"

	ExperimentalCStdVersion   = "gnu11"

	ExperimentalCStdVersion   = "gnu17"

	ExperimentalCppStdVersion = "gnu++2a"

	ExperimentalCppStdVersion = "gnu++2a"





	// prebuilts/clang default settings.

	// prebuilts/clang default settings.