diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-02-08 13:40:17 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-02-08 14:00:02 +0200 |
| commit | 88b19d170e07b328ce7518e5b0972b823653047c (patch) | |
| tree | 99dd89547faaf2344c843f2f85830eb7616249bb | |
| parent | 9ff904779e2c9c9dc563817950004e7299e4f796 (diff) | |
| download | aports-88b19d170e07b328ce7518e5b0972b823653047c.tar.bz2 aports-88b19d170e07b328ce7518e5b0972b823653047c.tar.xz | |
scripts/bootstrap.sh: workaround abuild bug
Current abuild has a bug that when CC is defined, it's used to
guess build architecture. But during cross-compile setup it points
to cross compiler and causing breakage. Export CBUILD after initial
abuild functions.sh run to workaround this.
| -rwxr-xr-x | scripts/bootstrap.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 804037c29a..e18c88b587 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -14,6 +14,7 @@ CBUILDROOT="$(CTARGET=$TARGET_ARCH . /usr/share/abuild/functions.sh ; echo $CBUI . /usr/share/abuild/functions.sh [ -z "$CBUILD_ARCH" ] && die "abuild is too old (use 2.29.0 or later)" [ -z "$CBUILDROOT" ] && die "CBUILDROOT not set for $TARGET_ARCH" +export CBUILD # deduce aports directory [ -z "$APORTS" ] && APORTS=$(realpath $(dirname $0)/../) |