]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: don't pass empty string to ar when using -compiler=gccgo
authorIan Lance Taylor <iant@golang.org>
Wed, 31 Oct 2018 16:32:51 +0000 (09:32 -0700)
committerIan Lance Taylor <iant@golang.org>
Wed, 31 Oct 2018 22:14:09 +0000 (22:14 +0000)
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>
src/cmd/go/internal/work/gccgo.go

index ca3be4fd364e1471cae8ee1da2e50331af5ff363..b89d07ead0a3890dc34ecae5d1db7df48e223f0a 100644 (file)
@@ -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)