3 files changed, 19 insertions, 6 deletions
diff --git a/src/cmd/clean.bash b/src/cmd/clean.bash
index 81cbbec1e7..262bcca1fd 100644
--- a/src/cmd/clean.bash
+++ b/src/cmd/clean.bash
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-for i in cc 6l 6a 6c 8l 8a 8c 5l 5a 5c gc 6g ar db nm acid cov gobuild godefs prof gotest
+for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g ar db nm acid cov gobuild godefs prof gotest
 do
 	cd $i
 	make clean
diff --git a/src/cmd/gobuild/Makefile b/src/cmd/gobuild/Makefile
index 8c0eb523b0..cb326c24f7 100644
--- a/src/cmd/gobuild/Makefile
+++ b/src/cmd/gobuild/Makefile
@@ -2,10 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# sadly, not auto-generated
+# ironically, not auto-generated
 
-O=6
-OS=568vqo
+O_arm=5
+O_amd64=6
+O_386=8
+OS=568vq
+
+O=$(O_$(GOARCH))
 GC=$(O)g
 CC=$(O)c -FVw
 AS=$(O)a
diff --git a/src/cmd/make.bash b/src/cmd/make.bash
index 08cffbb9b0..f406e358af 100644
--- a/src/cmd/make.bash
+++ b/src/cmd/make.bash
@@ -7,12 +7,21 @@ set -e
 
 bash clean.bash
 
-cd 6l
+case "$GOARCH" in
+386)	O=8;;
+amd64)	O=6;;
+arm)	O=5;;
+*)
+	echo 'unknown $GOARCH' 1>&2
+	exit 1
+esac
+
+cd ${O}l
 bash mkenam
 make enam.o
 cd ..
 
-for i in cc 6l 6a 6c gc 6g ar db nm acid cov godefs prof gotest
+for i in cc ${O}l ${O}a ${O}c gc ${O}g ar db nm acid cov godefs prof gotest
 do
 	echo; echo; echo %%%% making $i %%%%; echo
 	cd $i