cmd/go: permit $AR to include options

Handle the AR environment variable, used by gccgo,
the same way we handle the CC environment variable.

Change-Id: I4f42161469392f68f0b5adeb9c8b52359d5108a6
Reviewed-on: https://go-review.googlesource.com/c/go/+/526275
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>

diff --git a/src/cmd/go/internal/work/gccgo.go b/src/cmd/go/internal/work/gccgo.go
index dcc779ee97ec9baea6e426c5c8d25845993cc964..edf136df9297a166963fff6403d5df2ec9dff4ef 100644 (file)
--- a/src/cmd/go/internal/work/gccgo.go
+++ b/src/cmd/go/internal/work/gccgo.go
@@ -45,12 +45,8 @@ func (gccgoToolchain) linker() string {
        return GccgoBin
 }
 
-func (gccgoToolchain) ar() string {
-       ar := cfg.Getenv("AR")
-       if ar == "" {
-               ar = "ar"
-       }
-       return ar
+func (gccgoToolchain) ar() []string {
+       return envList("AR", "ar")
 }
 
 func checkGccgoBin() {