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

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

This reverts commit 13bc31d6e1.

Bug: 71694982
Reason for revert: Broke Mac build

Change-Id: I0da6866442ca9273dd329f0b82932f939b7f65ed
This commit is contained in:
Yi Kong 2018-01-08 18:10:35 +00:00
parent 13bc31d6e1
commit df97a8ac9c
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 return
} }
arCmd := "${config.ClangBin}/llvm-ar" arCmd := gccCmd(flags.toolchain, "ar")
arFlags := "crsD" arFlags := "crsPD"
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", "${config.ClangBin}/llvm-ar") ctx.Strict(makePrefix+"AR", gccCmd(toolchain, "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"))
} }