Commit 53ae7256 authored by Timo Teräs's avatar Timo Teräs

abuild: fix setting build-base properly for cross-create/cross-build

parent ad46156c
...@@ -60,6 +60,10 @@ error() { ...@@ -60,6 +60,10 @@ error() {
logcmd "ERROR: $pkgname: $1" logcmd "ERROR: $pkgname: $1"
} }
cross_creating() {
test "$CHOST" != "$CTARGET" -a -n "$CBUILDROOT"
}
cross_compiling() { cross_compiling() {
test "$CBUILD" != "$CHOST" -a -n "$CBUILDROOT" test "$CBUILD" != "$CHOST" -a -n "$CBUILDROOT"
} }
...@@ -1857,8 +1861,12 @@ builddeps() { ...@@ -1857,8 +1861,12 @@ builddeps() {
msg "Analyzing dependencies..." msg "Analyzing dependencies..."
local BUILD_BASE="" local BUILD_BASE=""
if ! options_has toolchain; then if cross_creating; then
cross_compiling && BUILD_BASE="build-base-$CTARGET_ARCH" || BUILD_BASE="build-base" options_has toolchain || BUILD_BASE="build-base-$CTARGET_ARCH"
elif cross_compiling; then
BUILD_BASE="build-base-$CTARGET_ARCH"
else
BUILD_BASE="build-base"
fi fi
calcdeps "$BUILD_BASE" calcdeps "$BUILD_BASE"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment