diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2013-12-17 07:36:01 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-12-17 07:36:01 -0500 |
| commit | d35b22d128ef72387ffb5d7e66ac40ba58d9ce8e (patch) | |
| tree | d3c917f167dde9a11a0e47564da01bada48f5736 /src | |
| parent | d24019f0fee979d6fdbb85ed29229869bee5b959 (diff) | |
| download | go-d35b22d128ef72387ffb5d7e66ac40ba58d9ce8e.tar.xz | |
cmd/ld: maintain correct headstring needed by windows port.
Fixes build for go_bootstrap.
Fixes #6971.
R=alex.brainman, mattn.jp, rsc
CC=golang-dev
https://golang.org/cl/43130043
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd/ld/lib.c | 1 | ||||
| -rw-r--r-- | src/cmd/ld/pobj.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/cmd/ld/lib.c b/src/cmd/ld/lib.c index 53c3ebd43c..76a3a1393a 100644 --- a/src/cmd/ld/lib.c +++ b/src/cmd/ld/lib.c @@ -1255,6 +1255,7 @@ setheadtype(char *s) fprint(2, "unknown header type -H %s\n", s); errorexit(); } + headstring = s; HEADTYPE = headtype(s); } diff --git a/src/cmd/ld/pobj.c b/src/cmd/ld/pobj.c index 16d908a407..08d44f6376 100644 --- a/src/cmd/ld/pobj.c +++ b/src/cmd/ld/pobj.c @@ -138,6 +138,8 @@ main(int argc, char *argv[]) if(HEADTYPE == -1) HEADTYPE = headtype(goos); ctxt->headtype = HEADTYPE; + if (headstring == NULL) + headstring = headstr(HEADTYPE); archinit(); ctxt->linkmode = linkmode; |