diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2012-03-13 03:34:22 +0800 |
|---|---|---|
| committer | Shenghou Ma <minux.ma@gmail.com> | 2012-03-13 03:34:22 +0800 |
| commit | b63b2c1c8134e19d02cbe7f7db7c09cefe2de448 (patch) | |
| tree | 125f22e9620de2964fedb567f876da6b273759e5 /src/make.bash | |
| parent | 3d8980c53f2b75682199081b5cac37d4d07e3c6b (diff) | |
| download | go-b63b2c1c8134e19d02cbe7f7db7c09cefe2de448.tar.gz | |
build: build correct cmd/dist matching GOHOSTARCH
Fix for issue 3210 comment #1.
R=adg, rsc
CC=golang-dev
http://codereview.appspot.com/5794057
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/make.bash b/src/make.bash index 3668e9204..b3db71a6b 100755 --- 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 |