build: build correct cmd/dist matching GOHOSTARCH

        Fix for issue 3210 comment #1.

R=adg, rsc
CC=golang-dev
https://golang.org/cl/5794057

diff --git a/src/make.bash b/src/make.bash
index 3668e92046d49a6b15dd529d8f3d3ec1e7449b5a..b3db71a6bde7216cd3fdecc4de57c3b699c6fb2c 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -86,7 +86,14 @@ echo cmd/dist
 export GOROOT="$(cd .. && pwd)"
 GOROOT_FINAL="${GOROOT_FINAL:-$GOROOT}"
 DEFGOROOT='-DGOROOT_FINAL="'"$GOROOT_FINAL"'"'
-gcc -O2 -Wall -Werror -ggdb -o cmd/dist/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c
+
+mflag=""
+case "$GOHOSTARCH" in
+386) mflag=-m32;;
+amd64) mflag=-m64;;
+esac
+gcc $mflag -O2 -Wall -Werror -ggdb -o cmd/dist/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c
+
 eval $(./cmd/dist/dist env -p)
 echo