diff --git a/cc/makevars.go b/cc/makevars.go
index 91ba748..ebb19f1 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -74,12 +74,12 @@
 
 	globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
 
-	ctx.CheckSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+	ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 		toolchain.ToolchainCflags(),
 		globalCflags,
 		toolchain.Cflags(),
 	}, " "))
-	ctx.CheckSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+	ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 		toolchain.ToolchainLdflags(),
 		toolchain.Ldflags(),
 	}, " "))
@@ -93,13 +93,13 @@
 
 		globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
 
-		ctx.CheckSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
+		ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 			toolchain.ToolchainClangCflags(),
 			globalClangCflags,
 			toolchain.ClangCflags(),
 			clangExtras,
 		}, " "))
-		ctx.CheckSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
+		ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 			toolchain.ToolchainClangLdflags(),
 			toolchain.ClangLdflags(),
 			clangExtras,