From c20c6132306391271a30eadf6d3b429d31c8dae4 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 22 Jul 2013 14:14:32 +0000
Subject: abuild: fix CARCH/CLIBC

We need set it in global scope as we need it even if we have not called
sanitycheck
---
 abuild.in | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/abuild.in b/abuild.in
index 013d059..17ff611 100755
--- a/abuild.in
+++ b/abuild.in
@@ -161,22 +161,7 @@ default_sanitycheck() {
 	[ -z "$CTARGET" ] && CTARGET="$CHOST"
 
 	if [ -z "$CARCH" ]; then
-		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
-	fi
-
-	# check CLIBC
-	if [ -z "$CLIBC" ]; then
-		case "$CHOST" in
-		*-*-*-uclibc*)	CLIBC="uclibc" ;;
-		*-*-*-musl*)	CLIBC="musl" ;;
-		*-*-*-gnu*)	CLIBC="eglibc" ;;
-		*)		CLIBC="uclibc" ;;
-		esac
+		die "Please fix CHOST, or set CARCH in abuild.conf"
 	fi
 
 	for i in $install; do
@@ -1878,6 +1863,23 @@ repo=${repo##*/}
 SRCDEST=${SRCDEST:-$startdir}
 PKGDEST=${PKGDEST:-$startdir}
 
+if [ -z "$CARCH" ]; then
+	case "$CHOST" in
+	arm*-*-*-*)	CARCH="armel" ;;
+	i[0-9]86-*-*-*)	CARCH="x86" ;;
+	x86_64-*-*-*)	CARCH="x86_64" ;;
+	esac
+fi
+
+if [ -z "$CLIBC" ]; then
+	case "$CHOST" in
+	*-*-*-uclibc*)	CLIBC="uclibc" ;;
+	*-*-*-musl*)	CLIBC="musl" ;;
+	*-*-*-gnu*)	CLIBC="eglibc" ;;
+	*)		CLIBC="uclibc" ;;
+	esac
+fi
+
 cd "$startdir" || die
 . "$APKBUILD"
 
-- 
cgit v1.2.3-70-g09d2