oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: fix CARCH/CLIBC

Browse Source 
We need set it in global scope as we need it even if we have not called
sanitycheck
This commit is contained in:
Natanael Copa 2013-07-22 14:14:32 +00:00
parent 2760f35c57
commit c20c613230
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
abuild.in
View File

@ -161,22 +161,7 @@ default_sanitycheck() {
[ -z "$CTARGET" ] && CTARGET="$CHOST" [ -z "$CTARGET" ] && CTARGET="$CHOST"
if [ -z "$CARCH" ]; then if [ -z "$CARCH" ]; then
case "$CHOST" in die "Please fix CHOST, or set CARCH in abuild.conf"
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
fi fi
for i in $install; do for i in $install; do
@ -1878,6 +1863,23 @@ repo=${repo##*/}
SRCDEST=${SRCDEST:-$startdir} SRCDEST=${SRCDEST:-$startdir}
PKGDEST=${PKGDEST:-$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 cd "$startdir" || die
. "$APKBUILD" . "$APKBUILD"