qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:24:39 -07:00
Code Releases Activity

cmd/dist: pass -m32 or -m64 to link too, not just compile

Browse Source 
R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5646053
This commit is contained in:
Russ Cox 2012-02-08 11:12:14 -05:00
parent 5b93fc9da6
commit 136f12f51f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/dist/build.c vendored
View File

@ -348,7 +348,6 @@ static char *proto_gccargs[] = {
"-fno-common", "-fno-common",
"-ggdb", "-ggdb",
"-O2", "-O2",
"-c",
}; };
static Vec gccargs; static Vec gccargs;
@ -561,9 +560,16 @@ install(char *dir)
vadd(&link, bpathf(&b, "%s/bin/tool/go_bootstrap%s", goroot, exe)); vadd(&link, bpathf(&b, "%s/bin/tool/go_bootstrap%s", goroot, exe));
} else { } else {
// C command. // C command.
vadd(&link, "gcc"); // Use gccargs, but ensure that link.p[2] is output file,
// as noted above.
vadd(&link, gccargs.p[0]);
vadd(&link, "-o"); vadd(&link, "-o");
vadd(&link, bpathf(&b, "%s/bin/tool/%s%s", goroot, name, exe)); vadd(&link, bpathf(&b, "%s/bin/tool/%s%s", goroot, name, exe));
vcopy(&link, gccargs.p+1, gccargs.len-1);
if(streq(gohostarch, "amd64"))
vadd(&link, "-m64");
else if(streq(gohostarch, "386"))
vadd(&link, "-m32");
} }
ttarg = mtime(link.p[2]); ttarg = mtime(link.p[2]);
@ -750,6 +756,7 @@ install(char *dir)
if(!isgo) { if(!isgo) {
// C library or tool. // C library or tool.
vcopy(&compile, gccargs.p, gccargs.len); vcopy(&compile, gccargs.p, gccargs.len);
vadd(&compile, "-c");
if(streq(gohostarch, "amd64")) if(streq(gohostarch, "amd64"))
vadd(&compile, "-m64"); vadd(&compile, "-m64");
else if(streq(gohostarch, "386")) else if(streq(gohostarch, "386"))