openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I697975ae430c2a0760434d401b0190b87f0220bf
This commit is contained in:
Elliott Hughes 2021-04-22 00:31:07 +00:00 committed by Automerger Merge Worker
parent d2685e495d fd6c513703
commit 04d2dcefa2
1 changed files with 3 additions and 3 deletions
Show Stats 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 {