aboutsummaryrefslogtreecommitdiff
path: root/libgo/go
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2023-09-06 11:21:11 -0700
committerIan Lance Taylor <iant@golang.org>2023-09-06 11:37:20 -0700
commitdab7163feedc99bd94549ee490031f86f8d0a6ca (patch)
treef1ff0c5380cd67ba40b197c07b22de6ed38d4aa2 /libgo/go
parent52e2aaaa70e847d240fb68a27c88ee60189515a6 (diff)
downloadgcc-dab7163feedc99bd94549ee490031f86f8d0a6ca.zip
gcc-dab7163feedc99bd94549ee490031f86f8d0a6ca.tar.gz
gcc-dab7163feedc99bd94549ee490031f86f8d0a6ca.tar.bz2
cmd/go: permit $AR to include options
Handle the AR environment variable, used by gccgo, the same way we handle the CC environment variable. This ports https://go.dev/cl/526275 to the gofrontend repo. This is needed for gccgo testing because the top-level GCC Makefile now passes a --plugin option to ar if it supports one. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/526295
Diffstat (limited to 'libgo/go')
-rw-r--r--libgo/go/cmd/go/internal/work/gccgo.go8
1 files changed, 2 insertions, 6 deletions
diff --git a/libgo/go/cmd/go/internal/work/gccgo.go b/libgo/go/cmd/go/internal/work/gccgo.go
index c1026c7..3e07f87 100644
--- a/libgo/go/cmd/go/internal/work/gccgo.go
+++ b/libgo/go/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() {