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

Merge "Remove most of the remaining references to gccCmd." am: aa4c712989

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1696319

Change-Id: Ia39631f189b56118df77fd22794cb3add7fc25a5
This commit is contained in:
Elliott Hughes
2021-05-07 18:35:21 +00:00
committed by Automerger Merge Worker
parent e21f8f645c aa4c712989
commit a09ee94843
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/makevars.go
View File

@@ -285,11 +285,14 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
}
if target.Os.Class == android.Device {
ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy"))
ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld"))
ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
ctx.Strict(makePrefix+"OBJCOPY", "${config.ClangBin}/llvm-objcopy")
ctx.Strict(makePrefix+"LD", "${config.ClangBin}/lld")
ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain))
// TODO: work out whether to make this "${config.ClangBin}/llvm-", which
// should mostly work, or remove it.
ctx.Strict(makePrefix+"TOOLS_PREFIX", gccCmd(toolchain, ""))
// TODO: GCC version is obsolete now that GCC has been removed.
ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
}
if target.Os.Class == android.Host {