@@ -60,11 +60,11 @@
 
 		case "${CPUPLAT}" in
 			i?86)
 				CPUPLAT="ix86"
 				;;
-			sun4?)
+			sun4m)
 				CPUPLAT="sparc"
 				;;
 		esac
 
 		echo "linux-glibc${GLIBCVERS}-${CPUPLAT}"
@@ -72,24 +72,24 @@
 	SunOS)
 		SUNMAJVER=$(uname -r | cut -f 1 -d .)
 		SUNMINVER=$(uname -r | cut -f 2 -d .)
 		SOLVER="$[${SUNMAJVER} - 3].${SUNMINVER}"
 
-
-		case "`uname -m`" in
-			sun4?)
-				CPUPLAT="sparc"
-				;;
-			*)
-				CPUPLAT="ix86"
-				;;
-		esac
+		if [ -z "${CPUPLAT}" ]; then
+			echo 'Unable to determine platform' >&2
+
+			exit 1
+		fi
 
 		echo "solaris${SOLVER}-${CPUPLAT}"
 		;;
 	HP-UX)
 		echo "hpux-${CPUPLAT}"
 		;;
 	*)
-		echo "`uname -s | dd conv=lcase 2>/dev/null`-`uname -m | dd conv=lcase 2>/dev/null`"
+		if [ -z "${CPUPLAT}" ]; then
+			CPUPLAT="`uname -m | dd conv=lcase 2>/dev/null`"
+		fi
+
+		echo "`uname -s | dd conv=lcase 2>/dev/null`-${CPUPLAT}"
 		;;
 esac