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

Switch to llvm-ar (with crsD flags only).

Browse Source 
llvm-ar is required for platform LTO build.

Bug: 71618641
Test: m checkbuild
Change-Id: Idecea9fbe5dcbb1023dbe90047e3f9535d953440
This commit is contained in:
Yi Kong
2017-11-29 16:47:43 -08:00
parent e7fa3b1b74
commit 13bc31d6e1
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

@@ -508,8 +508,8 @@ func TransformObjToStaticLib(ctx android.ModuleContext, objFiles android.Paths,
return return
} }
arCmd := gccCmd(flags.toolchain, "ar") arCmd := "${config.ClangBin}/llvm-ar"
arFlags := "crsPD" arFlags := "crsD"
if flags.arFlags != "" { if flags.arFlags != "" {
arFlags += " " + flags.arFlags arFlags += " " + flags.arFlags
} }

2
cc/makevars.go
View File

@@ -289,7 +289,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
if target.Os == android.Darwin { if target.Os == android.Darwin {
ctx.Strict(makePrefix+"AR", "${config.MacArPath}") ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
} else { } else {
ctx.Strict(makePrefix+"AR", gccCmd(toolchain, "ar")) ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar")
ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf")) ctx.Strict(makePrefix+"READELF", gccCmd(toolchain, "readelf"))
ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm")) ctx.Strict(makePrefix+"NM", gccCmd(toolchain, "nm"))
} }