Merge "Remove unneeded -Wno-constant-logical-operand flag"
diff --git a/cc/compiler.go b/cc/compiler.go
index ad1fc6d..ea64b6a 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -414,9 +414,6 @@
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 3ece649..8e11331 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -79,7 +79,6 @@
"bc": Allowed,
"bzip2": Allowed,
"chmod": Allowed,
- "cmp": Allowed,
"cp": Allowed,
"cut": Allowed,
"date": Allowed,
@@ -162,6 +161,7 @@
// On linux we'll use the toybox version of these instead
"basename": Toybox,
"cat": Toybox,
+ "cmp": Toybox,
"comm": Toybox,
"env": Toybox,
"id": Toybox,