From: Russ Cox <rsc@golang.org>
Date: Wed, 8 Feb 2012 16:12:14 +0000 (-0500)
Subject: cmd/dist: pass -m32 or -m64 to link too, not just compile
X-Git-Tag: weekly.2012-02-14~219
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=136f12f51fde69d5b0c89ec7a9cd9436c7b7535d;p=gostls13.git

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

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5646053
---

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 9aa1b0cce9..6aed1b4359 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -348,7 +348,6 @@ static char *proto_gccargs[] = {
 	"-fno-common",
 	"-ggdb",
 	"-O2",
-	"-c",
 };
 
 static Vec gccargs;
@@ -561,9 +560,16 @@ install(char *dir)
 		vadd(&link, bpathf(&b, "%s/bin/tool/go_bootstrap%s", goroot, exe));
 	} else {
 		// 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, 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]);
 
@@ -750,6 +756,7 @@ install(char *dir)
 		if(!isgo) {
 			// C library or tool.
 			vcopy(&compile, gccargs.p, gccargs.len);
+			vadd(&compile, "-c");
 			if(streq(gohostarch, "amd64"))
 				vadd(&compile, "-m64");
 			else if(streq(gohostarch, "386"))