diff --git a/cc/makevars.go b/cc/makevars.go
index ea32121..3dd0f74 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -113,7 +113,9 @@
 		toolchain.ToolchainCflags(),
 		productExtraCflags,
 	}, " "))
-	ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", "")
+	ctx.Strict(makePrefix+"GLOBAL_CONLYFLAGS", strings.Join([]string{
+		"${config.CommonGlobalConlyflags}",
+	}, " "))
 	ctx.Strict(makePrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
 		"${config.CommonGlobalCppflags}",
 		toolchain.Cppflags(),
@@ -161,7 +163,6 @@
 			clangExtras,
 			productExtraCflags,
 		}, " "))
-		ctx.Strict(clangPrefix+"GLOBAL_CONLYFLAGS", "${config.ClangExtraConlyflags}")
 		ctx.Strict(clangPrefix+"GLOBAL_CPPFLAGS", strings.Join([]string{
 			"${config.CommonClangGlobalCppflags}",
 			toolchain.ClangCppflags(),