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

Merge "Move some make variables from GNU binutils to LLVM equivalents." am: 7c0abf6f3c

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

Change-Id: I568de05d0b8225a5c554f46cd4723602a5ec4069
This commit is contained in:
Elliott Hughes
2021-04-21 23:48:44 +00:00
committed by Automerger Merge Worker
parent aa3aee5205 7c0abf6f3c
commit 6b4a5ab97b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/makevars.go
View File

@@ -280,9 +280,9 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
ctx.Strict(makePrefix+"STRIP", "${config.MacStripPath}") ctx.Strict(makePrefix+"STRIP", "${config.MacStripPath}")
} else { } else {
ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar")
ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) ctx.Strict(makePrefix+"READELF", "${config.ClangBin}/llvm-readelf")
ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) ctx.Strict(makePrefix+"NM", "${config.ClangBin}/llvm-nm")
ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip")) ctx.Strict(makePrefix+"STRIP", "${config.ClangBin}/llvm-strip")
} }
if target.Os.Class == android.Device { if target.Os.Class == android.Device {