abuild: set CARCH and CLIBC always, guess from CHOST if not set

1 files changed, 23 insertions, 5 deletions

diff --git a/abuild.in b/abuild.in
index 3fdae0b..ebf8a00 100755
--- a/abuild.in
+++ b/abuild.in
@@ -156,14 +156,32 @@ default_sanitycheck() {
 	done
 
 	# check if CARCH, CBUILD, CHOST and CTARGET is set
+	[ -z "$CHOST" ] && die "Please set CHOST in /etc/abuild.conf"
+	[ -z "$CBUILD" ] && CBUILD="$CHOST"
+	[ -z "$CTARGET" ] && CTARGET="$CHOST"
+
 	if [ -z "$CARCH" ]; then
-		case "$(uname -m)" in
-		i[0-9]86) suggestion=" (Suggestion: CARCH=x86)";;
-		x86_64) suggestion=" (Suggestion: CARCH=x86_64)";;
+		case "$CHOST" in
+		arm*-*-*-*)	CARCH="armel" ;;
+		i[0-9]86-*-*-*)	CARCH="x86" ;;
+		x86_64-*-*-*)	CARCH="x86_64" ;;
+		*)		die "Please fix CHOST, or set CARCH in abuild.conf"
 		esac
-		die "Please set CARCH in /etc/abuild.conf$suggestion"
 	fi
-	[ -z "$CHOST" ] && die "Please set CHOST in /etc/abuild.conf"
+
+	# check CLIBC
+	if [ -z "$CLIBC" ]; then
+		if [ -z "$ALPINE_LIBC" ]; then
+			case "$CHOST" in
+			*-*-*-uclibc*)	CLIBC="uclibc" ;;
+			*-*-*-musl*)	CLIBC="musl" ;;
+			*-*-*-gnu*)	CLIBC="eglibc" ;;
+			*)		CLIBC="uclibc" ;;
+			esac
+		else
+			CLIBC="$ALPINE_LIBC"
+		fi
+	fi
 
 	for i in $install; do
 		local n=${i%.*}