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

Commit 60045811 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Gerrit Code Review
Browse files

Merge "Stop mapping c++17 to c++1z."

parents a0aaf2f4 d7225eaa

cc/compiler.go

+0 −3
Original line number Diff line number Diff line
@@ -414,9 +414,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
		cppStd = config.CppStdVersion

	case "experimental":

		cppStd = config.ExperimentalCppStdVersion

	case "c++17", "gnu++17":

		// Map c++17 and gnu++17 to their 1z equivalents, until 17 is finalized.

		cppStd = strings.Replace(String(compiler.Properties.Cpp_std), "17", "1z", 1)

	}



	if compiler.Properties.Gnu_extensions != nil && *compiler.Properties.Gnu_extensions == false {