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

Merge "Use "${config.ClangBin}/llvm-" for TOOLS_PREFIX." am: ca8f680040

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

Change-Id: Idc1d5db8d24b93b259f70d98b3edf144d18673b7
This commit is contained in:
Elliott Hughes
2021-05-18 17:28:59 +00:00
committed by Automerger Merge Worker
parent a32917788f ca8f680040
commit 775ae43973
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/makevars.go
View File

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