commit 72801291d6cb2109cc6578b4d1fb508cd4ae4f43
author Shenghou Ma <minux.ma@gmail.com> Tue Mar 13 03:34:22 2012 +0800
committer Shenghou Ma <minux.ma@gmail.com> Tue Mar 13 03:34:22 2012 +0800
tree 038c6e7d8964c5c178631d397aff100a9d6d6611
parent 0359621241d09521978950ebc5e068352a549c64

build: build correct cmd/dist matching GOHOSTARCH
        Fix for issue 3210 comment #1.

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

src/make.bash

diff --git a/src/make.bash b/src/make.bash
index 3668e92..b3db71a 100755
--- a/src/make.bash
+++ b/src/make.bash
@@ -86,7 +86,14 @@
 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