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

Commit d7225eaa authored by Peter Collingbourne's avatar Peter Collingbourne
Browse files

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

Clang has been accepting -std=c++17 since August 2017.

Change-Id: Iebb91438ba26b3cc4dbbdcd86e15c9df5901f402
parent f46b1cb0

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 {