diff --git a/cc/builder.go b/cc/builder.go index de85d6e7f..a280ec51c 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -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 } diff --git a/cc/makevars.go b/cc/makevars.go index 0d2569adb..5faf2018c 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -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")) }