Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/link: link go.o first

Browse source 
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>
This commit is contained in:
Russ Cox 2015-11-16 15:45:12 -05:00
parent 918a2644f2
commit 6bf794a36d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/link/internal/ld/lib.go
View file

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