Merge commit '7de4137d4678a3bcbd735f887028489f97f1e479' into embed-cmds

# Conflicts:
#	internal/build/build.go

cmd/internal/flags/flags.go

@@ -34,6 +34,7 @@ var AbiMode int
 var CheckLinkArgs bool
 var CheckLLFiles bool
 var GenLLFiles bool
+var ForceEspClang bool
 
 func AddCommonFlags(fs *flag.FlagSet) {
 	fs.BoolVar(&Verbose, "v", false, "Verbose output")
@@ -47,6 +48,7 @@ func AddBuildFlags(fs *flag.FlagSet) {
 		fs.BoolVar(&CheckLinkArgs, "check-linkargs", false, "check link args valid")
 		fs.BoolVar(&CheckLLFiles, "check-llfiles", false, "check .ll files valid")
 		fs.BoolVar(&GenLLFiles, "gen-llfiles", false, "generate .ll files for pkg export")
+		fs.BoolVar(&ForceEspClang, "force-espclang", false, "force to use esp-clang")
 	}
 }
 
@@ -95,5 +97,6 @@ func UpdateConfig(conf *build.Config) {
 		conf.CheckLinkArgs = CheckLinkArgs
 		conf.CheckLLFiles = CheckLLFiles
 		conf.GenLL = GenLLFiles
+		conf.ForceEspClang = ForceEspClang
 	}
 }