fix: collecting build flags

When collecting build flags for the ninja build rule
both backend trying to add module flags to the toolchain
flags. This can provide breakage flags as all modules
ties to modify Toolchian flags.

Toolchain flags should never be changed and added to slice
before module flags and that slice should be used to build
the ninja rule.

Change-Id: I558bb11a7220b38e118f64c47f375f323d3ac3ed

Author: birunts

core/androidninja_backend.go

@@ -304,33 +304,36 @@ func (g *androidNinjaGenerator) getSharedLibLinkPaths(ctx blueprint.ModuleContex
 func (g *androidNinjaGenerator) CompileObjs(l Compilable, ctx blueprint.ModuleContext, tc toolchain.Toolchain) ([]string, []string) {
 	orderOnly := GetGeneratedHeadersFiles(ctx)
 
-	// tc := backend.Get().GetToolchain(tgtType)
 	as, astargetflags := tc.GetAssembler()
 	cc, cctargetflags := tc.GetCCompiler()
 	cxx, cxxtargetflags := tc.GetCXXCompiler()
+
 	cflagsList := []string{}
+	asflagsList := []string{}
+	ccflagsList := []string{}
+	cxxflagsList := []string{}
 
 	// Get all the required flags and group them into includes and everything else.
 	// This should make it easier to visually inspect the flags in logs/ninja files.
 	l.FlagsInTransitive(ctx).GroupByType(flag.TypeInclude).ForEach(
 		func(f flag.Flag) {
 			switch {
 			case (f.Type() & flag.TypeCompilable) == flag.TypeC: //c exclusive flags
-				cctargetflags = append(cctargetflags, f.ToString())
+				ccflagsList = append(ccflagsList, f.ToString())
 			case f.MatchesType(flag.TypeCC | flag.TypeInclude):
 				cflagsList = append(cflagsList, f.ToString())
 			case f.MatchesType(flag.TypeAsm):
-				astargetflags = append(astargetflags, f.ToString())
+				asflagsList = append(asflagsList, f.ToString())
 			case f.MatchesType(flag.TypeCpp):
-				cxxtargetflags = append(cxxtargetflags, f.ToString())
+				cxxflagsList = append(cxxflagsList, strings.Clone(f.ToString()))
 			}
 		},
 	)
 
-	ctx.Variable(pctx, "asflags", strings.Join(astargetflags, " "))
+	ctx.Variable(pctx, "asflags", utils.Join(astargetflags, asflagsList))
 	ctx.Variable(pctx, "cflags", strings.Join(cflagsList, " "))
-	ctx.Variable(pctx, "conlyflags", strings.Join(cctargetflags, " "))
-	ctx.Variable(pctx, "cxxflags", strings.Join(cxxtargetflags, " "))
+	ctx.Variable(pctx, "conlyflags", utils.Join(cctargetflags, ccflagsList))
+	ctx.Variable(pctx, "cxxflags", utils.Join(cxxtargetflags, cxxflagsList))
 
 	objectFiles := []string{}
 	nonCompiledDeps := []string{}

core/generated_common.go

@@ -242,9 +242,9 @@ func (m *ModuleGenerateCommon) getArgs(ctx blueprint.ModuleContext) (string, map
 		"bob_config_opts": env.ConfigOpts,
 		"cc":              cc,
 		"cflags":          strings.Join(props.Cflags, " "),
-		"conlyflags":      strings.Join(append(cctargetflags, props.Conlyflags...), " "),
+		"conlyflags":      utils.Join(cctargetflags, props.Conlyflags),
 		"cxx":             cxx,
-		"cxxflags":        strings.Join(append(cxxtargetflags, props.Cxxflags...), " "),
+		"cxxflags":        utils.Join(cxxtargetflags, props.Cxxflags),
 		"ldflags":         utils.Join(ldtargetflags, props.Ldflags),
 		"ldlibs":          utils.Join(ldlibs, props.Ldlibs),
 		"linker":          linker,

core/linux_cclibs.go

@@ -59,33 +59,36 @@ type Compilable interface {
 func (g *linuxGenerator) CompileObjs(l Compilable, ctx blueprint.ModuleContext, tc toolchain.Toolchain) ([]string, []string) {
 	orderOnly := GetGeneratedHeadersFiles(ctx)
 
-	// tc := backend.Get().GetToolchain(tgtType)
 	as, astargetflags := tc.GetAssembler()
 	cc, cctargetflags := tc.GetCCompiler()
 	cxx, cxxtargetflags := tc.GetCXXCompiler()
+
 	cflagsList := []string{}
+	asflagsList := []string{}
+	ccflagsList := []string{}
+	cxxflagsList := []string{}
 
 	// Get all the required flags and group them into includes and everything else.
 	// This should make it easier to visually inspect the flags in logs/ninja files.
 	l.FlagsInTransitive(ctx).GroupByType(flag.TypeInclude).ForEach(
 		func(f flag.Flag) {
 			switch {
 			case (f.Type() & flag.TypeCompilable) == flag.TypeC: //c exclusive flags
-				cctargetflags = append(cctargetflags, f.ToString())
+				ccflagsList = append(ccflagsList, f.ToString())
 			case f.MatchesType(flag.TypeCC | flag.TypeInclude):
 				cflagsList = append(cflagsList, f.ToString())
 			case f.MatchesType(flag.TypeAsm):
-				astargetflags = append(astargetflags, f.ToString())
+				asflagsList = append(asflagsList, f.ToString())
 			case f.MatchesType(flag.TypeCpp):
-				cxxtargetflags = append(cxxtargetflags, f.ToString())
+				cxxflagsList = append(cxxflagsList, strings.Clone(f.ToString()))
 			}
 		},
 	)
 
-	ctx.Variable(pctx, "asflags", strings.Join(astargetflags, " "))
+	ctx.Variable(pctx, "asflags", utils.Join(astargetflags, asflagsList))
 	ctx.Variable(pctx, "cflags", strings.Join(cflagsList, " "))
-	ctx.Variable(pctx, "conlyflags", strings.Join(cctargetflags, " "))
-	ctx.Variable(pctx, "cxxflags", strings.Join(cxxtargetflags, " "))
+	ctx.Variable(pctx, "conlyflags", utils.Join(cctargetflags, ccflagsList))
+	ctx.Variable(pctx, "cxxflags", utils.Join(cxxtargetflags, cxxflagsList))
 
 	objectFiles := []string{}
 	nonCompiledDeps := []string{}