]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/link: link go.o first
authorRuss Cox <rsc@golang.org>
Mon, 16 Nov 2015 20:45:12 +0000 (15:45 -0500)
committerRuss Cox <rsc@golang.org>
Wed, 18 Nov 2015 19:00:45 +0000 (19:00 +0000)
Does not fix #12327 but nicer anyway.

Change-Id: I4ad730a4ca833d76957b7571895b3a08a6a530d4
Reviewed-on: https://go-review.googlesource.com/16964
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/cmd/link/internal/ld/lib.go

index c59f49d1081b5f93fc94065243423be82e310f57..4289455252a2c4dcabc561dc327ec7ff507945fa 100644 (file)
@@ -1003,8 +1003,8 @@ func archive() {
 
        mayberemoveoutfile()
        argv := []string{"ar", "-q", "-c", "-s", outfile}
-       argv = append(argv, hostobjCopy()...)
        argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir))
+       argv = append(argv, hostobjCopy()...)
 
        if Debug['v'] != 0 {
                fmt.Fprintf(&Bso, "archive: %s\n", strings.Join(argv, " "))
@@ -1116,8 +1116,8 @@ func hostlink() {
                argv = append(argv, "-Qunused-arguments")
        }
 
-       argv = append(argv, hostobjCopy()...)
        argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir))
+       argv = append(argv, hostobjCopy()...)
 
        if Linkshared {
                seenDirs := make(map[string]bool)