diff options
| -rw-r--r-- | cc/compiler.go | 3 | ||||
| -rw-r--r-- | ui/build/paths/config.go | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index ad1fc6d93..ea64b6a6c 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -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 { diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index 3ece649be..8e113315a 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -79,7 +79,6 @@ var Configuration = map[string]PathConfig{ "bc": Allowed, "bzip2": Allowed, "chmod": Allowed, - "cmp": Allowed, "cp": Allowed, "cut": Allowed, "date": Allowed, @@ -162,6 +161,7 @@ var Configuration = map[string]PathConfig{ // On linux we'll use the toybox version of these instead "basename": Toybox, "cat": Toybox, + "cmp": Toybox, "comm": Toybox, "env": Toybox, "id": Toybox, |