tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Yi Kong 2018-01-05 22:54:53 +00:00 committed by Gerrit Code Review
commit aa92b80bc3
2 changed files with 3 additions and 3 deletions
Show stats 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
}
arCmd := gccCmd(flags.toolchain, "ar")
arFlags := "crsPD"
arCmd := "${config.ClangBin}/llvm-ar"
arFlags := "crsD"
if 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 {
ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
} 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+"NM", gccCmd(toolchain, "nm"))
}