From 88b19d170e07b328ce7518e5b0972b823653047c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sat, 8 Feb 2020 13:40:17 +0200
Subject: [PATCH] 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.
---
 scripts/bootstrap.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 804037c29a8f..e18c88b58758 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)/../)
-- 
GitLab