--- a/setup-buildenv.sh	Sat Apr 16 13:41:02 2011 +0200
+++ b/setup-buildenv.sh	Sat Apr 16 13:47:23 2011 +0200
@@ -5,9 +5,28 @@
 export LC_ALL=C
 export PATH=/usr/xpg6/bin:/usr/xpg4/bin:/usr/bin:/sbin:/usr/sbin
 
+error ()
+{
+    printf "error: %s\n" "$@" >&2
+    exit 1
+}
+
+usage ()
+{
+    printf "usage: ${0##*/} [-b build_number] [-u username]" >&2
+}
+
 builduser="abuild"
+cpu_type="$(uname -p)"
+if [ "${cpu_type}" = "i386" ]; then
+    arch="x86"
+elif [ "${cpu_type}" = "sparc" ]; then
+    arch="sparc"
+else
+    error "unknown architecture"
+fi
 CBE_SOURCE="desktop-cbe-mini-1.8.0.tar.bz2"
-SS_SOURCE="sunstudio12u1-patched-ii-2010Feb-sol-x86.tar.gz"
+SS_SOURCE="sunstudio12u1-patched-ii-2010Feb-sol-${arch}.tar.gz"
 TMPDIR="${TMPDIR:-/var/tmp}"
 PKGS='system/xopen/xcu4
 text/gnu-patch
@@ -23,17 +42,6 @@
 sourcedir="${basedir}/sources"
 patchdir="${basedir}/patches"
 
-error ()
-{
-    printf "error: %s\n" "$@" >&2
-    exit 1
-}
-
-usage ()
-{
-    printf "usage: ${0##*/} [-b build_number] [-u username]" >&2
-}
-
 while getopts b:u: opt
 do
     case "$opt" in