From: Ian Lance Taylor <iant@golang.org>
Date: Wed, 31 Oct 2018 16:32:51 +0000 (-0700)
Subject: cmd/go: don't pass empty string to ar when using -compiler=gccgo
X-Git-Tag: go1.12beta1~559
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d086c5c81f6e19e1dce0a17d901fec071b9394ff;p=gostls13.git

cmd/go: don't pass empty string to ar when using -compiler=gccgo

Correct error introduced in CL 145417 on non-AIX systems.

Fixes #28511

Change-Id: I6624939061425af19faccedd271f465d1fe6b975
Reviewed-on: https://go-review.googlesource.com/c/146277
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/cmd/go/internal/work/gccgo.go b/src/cmd/go/internal/work/gccgo.go
index ca3be4fd36..b89d07ead0 100644
--- a/src/cmd/go/internal/work/gccgo.go
+++ b/src/cmd/go/internal/work/gccgo.go
@@ -186,12 +186,12 @@ func (gccgoToolchain) pack(b *Builder, a *Action, afile string, ofiles []string)
 	for _, f := range ofiles {
 		absOfiles = append(absOfiles, mkAbs(objdir, f))
 	}
-	var arArgs string
+	var arArgs []string
 	if cfg.Goos == "aix" && cfg.Goarch == "ppc64" {
 		// AIX puts both 32-bit and 64-bit objects in the same archive.
 		// Tell the AIX "ar" command to only care about 64-bit objects.
 		// AIX "ar" command does not know D option.
-		arArgs = "-X64"
+		arArgs = []string{"-X64"}
 	}
 
 	return b.run(a, p.Dir, p.ImportPath, nil, "ar", arArgs, "rc", mkAbs(objdir, afile), absOfiles)