StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename gccCmd mingwCmd now that's all it's used for."

Browse Source
This commit is contained in:
Elliott Hughes
2021-06-01 21:40:16 +00:00
committed by Gerrit Code Review
parent ebdf61ece2 5f314b1613
commit 2a8b0530fa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/builder.go
View File

@@ -534,7 +534,7 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
Implicits: cFlagsDeps, Implicits: cFlagsDeps,
OrderOnly: pathDeps, OrderOnly: pathDeps,
Args: map[string]string{ Args: map[string]string{
"windresCmd": gccCmd(flags.toolchain, "windres"), "windresCmd": mingwCmd(flags.toolchain, "windres"),
"flags": flags.toolchain.WindresFlags(), "flags": flags.toolchain.WindresFlags(),
}, },
}) })
@@ -1069,6 +1069,6 @@ func transformArchiveRepack(ctx android.ModuleContext, inputFile android.Path,
}) })
} }
func gccCmd(toolchain config.Toolchain, cmd string) string { func mingwCmd(toolchain config.Toolchain, cmd string) string {
return filepath.Join(toolchain.GccRoot(), "bin", toolchain.GccTriple()+"-"+cmd) return filepath.Join(toolchain.GccRoot(), "bin", toolchain.GccTriple()+"-"+cmd)
} }

2
cc/gen.go
View File

@@ -204,7 +204,7 @@ func genWinMsg(ctx android.ModuleContext, srcFile android.Path, flags builderFla
headerFile := android.GenPathWithExt(ctx, "windmc", srcFile, "h") headerFile := android.GenPathWithExt(ctx, "windmc", srcFile, "h")
rcFile := android.GenPathWithExt(ctx, "windmc", srcFile, "rc") rcFile := android.GenPathWithExt(ctx, "windmc", srcFile, "rc")
windmcCmd := gccCmd(flags.toolchain, "windmc") windmcCmd := mingwCmd(flags.toolchain, "windmc")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: windmc, Rule: windmc,