diff --git a/cc/makevars.go b/cc/makevars.go
index 97a26def5..48698bf82 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -83,6 +83,11 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
 		globalCflags,
 		toolchain.Cflags(),
 	}, " "))
+	ctx.StrictSorted(makePrefix+"GLOBAL_CONLYFLAGS", "")
+	ctx.StrictSorted(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
+		"${commonGlobalCppflags}",
+		toolchain.Cppflags(),
+	}, " "))
 	ctx.StrictSorted(makePrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 		toolchain.ToolchainLdflags(),
 		toolchain.Ldflags(),
@@ -107,6 +112,11 @@ func makeVarsToolchain(ctx common.MakeVarsContext, secondPrefix string,
 			toolchain.ClangCflags(),
 			clangExtras,
 		}, " "))
+		ctx.StrictSorted(clangPrefix+"GLOBAL_CONLYFLAGS", "${clangExtraConlyflags}")
+		ctx.StrictSorted(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
+			"${commonClangGlobalCppflags}",
+			toolchain.ClangCppflags(),
+		}, " "))
 		ctx.StrictSorted(clangPrefix+"GLOBAL_LDFLAGS", strings.Join([]string{
 			toolchain.ToolchainClangLdflags(),
 			toolchain.ClangLdflags(),