commit e6f4ee2061b49899c71faeb9684d77ac53b27d6a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 08 22:15:51 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 08 22:15:51 2018 +0000
tree ff6303cc18e8c65c72a812aa980f7ada503bf56b
parent 8a832c3e6d0255e565da51dcd4ed210b81272750
parent b21df8f66fcf7e0a53b560c830cbe5ddeb07c6cf

Merge "Add target.vendor.override_export_include_dirs."

cc/builder.go

diff --git a/cc/builder.go b/cc/builder.go
index a280ec5..de85d6e 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -508,8 +508,8 @@
 		return
 	}
 
-	arCmd := "${config.ClangBin}/llvm-ar"
-	arFlags := "crsD"
+	arCmd := gccCmd(flags.toolchain, "ar")
+	arFlags := "crsPD"
 	if flags.arFlags != "" {
 		arFlags += " " + flags.arFlags
 	}

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index 5faf201..0d2569a 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -289,7 +289,7 @@
 	if target.Os == android.Darwin {
 		ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
 	} 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+"NM", gccCmd(toolchain, "nm"))
 	}