|
1 From aca4fa5cf5fac24b9bcb7ffab4b2bb7b9ab1fdc4 Mon Sep 17 00:00:00 2001 |
|
2 From: Russ Cox <[email protected]> |
|
3 Date: Mon, 16 Nov 2015 15:45:12 -0500 |
|
4 Subject: [PATCH 51/63] [release-branch.go1.5] cmd/link: link go.o first |
|
5 |
|
6 Does not fix #12327 but nicer anyway. |
|
7 |
|
8 Change-Id: I4ad730a4ca833d76957b7571895b3a08a6a530d4 |
|
9 Reviewed-on: https://go-review.googlesource.com/16964 |
|
10 Reviewed-by: Ian Lance Taylor <[email protected]> |
|
11 Reviewed-on: https://go-review.googlesource.com/17126 |
|
12 --- |
|
13 src/cmd/link/internal/ld/lib.go | 4 ++-- |
|
14 1 file changed, 2 insertions(+), 2 deletions(-) |
|
15 |
|
16 diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go |
|
17 index 8ccbec9..a9ec3d2 100644 |
|
18 --- a/src/cmd/link/internal/ld/lib.go |
|
19 +++ b/src/cmd/link/internal/ld/lib.go |
|
20 @@ -886,8 +886,8 @@ func archive() { |
|
21 |
|
22 mayberemoveoutfile() |
|
23 argv := []string{"ar", "-q", "-c", "-s", outfile} |
|
24 - argv = append(argv, hostobjCopy()...) |
|
25 argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir)) |
|
26 + argv = append(argv, hostobjCopy()...) |
|
27 |
|
28 if Debug['v'] != 0 { |
|
29 fmt.Fprintf(&Bso, "archive: %s\n", strings.Join(argv, " ")) |
|
30 @@ -1012,8 +1012,8 @@ func hostlink() { |
|
31 argv = append(argv, "-Qunused-arguments") |
|
32 } |
|
33 |
|
34 - argv = append(argv, hostobjCopy()...) |
|
35 argv = append(argv, fmt.Sprintf("%s/go.o", tmpdir)) |
|
36 + argv = append(argv, hostobjCopy()...) |
|
37 |
|
38 if Linkshared { |
|
39 seenDirs := make(map[string]bool) |
|
40 -- |
|
41 2.6.1 |
|
42 |