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

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

This properly sets -format=gnu for all non-Darwin targets, because
llvm-ar is cross-platform (but defaults to the host environment).

Bug: http://b/71618641
Test: m checkbuild
Change-Id: Ic5bce7e237ea0cadfa1f96ea151d41115d8c56b8
This commit is contained in:
Stephen Hines 2018-01-09 23:29:04 -08:00
parent 2605a61f2d
commit f1addebb44
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cc/builder.go
View File

@ -508,8 +508,11 @@ 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 !ctx.Darwin() {
arFlags += " -format=gnu"
}
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"))
} }