diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 09ea0962d68cf1a519ca52fe94886cb591ca9097..8bacc931c21f40ab415f41f4fa3dea67870d4788 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -5,7 +5,6 @@ pkgrel=1
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
 depends=""
-options="toolchain"
 makedepends_build="bison flex texinfo"
 makedepends_host="zlib-dev"
 makedepends="$makedepends_build $makedepends_host"
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index 47e1007d91c4b373ab5b3b18b66c369ac5936dfd..ea73b5bd85b1f54f201ee899e7d27309cf4b6dc2 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -13,7 +13,6 @@ url="http://gcc.gnu.org"
 arch="all"
 license="GPL LGPL"
 _gccrel=$pkgver-r$pkgrel
-options="toolchain"
 depends="binutils$_target isl"
 makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev"
@@ -42,7 +41,7 @@ if [ "$CARCH" = aarch64 ]; then
 fi
 
 if [ "$CHOST" != "$CTARGET" ]; then
-	if [ "$BOOTSTRAP" ]; then
+	if [ "$BOOTSTRAP" = nolibc ]; then
 		LANG_CXX=false
 		LANG_ADA=false
 		LIBGCC=false
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 255c4fb75cf03eba7914efa40936014d639a58fb..2d6002b2f80aa53b87f55cd3b6a1451a8ab03ef4 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -9,7 +9,6 @@ arch="all"
 license="MIT"
 depends=""
 depends_dev="!uclibc-dev"
-options="toolchain"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-dbg libc6-compat:compat:noarch"
 case "$BOOTSTRAP" in
@@ -42,7 +41,7 @@ builddir="$srcdir"/musl-$pkgver
 build() {
 	cd "$builddir"
 
-	[ "$BOOTSTRAP" == "nocc" ] && return 0
+	[ "$BOOTSTRAP" = "nocc" ] && return 0
 
 	# provide minimal libssp_nonshared.a so we don't need libssp from gcc
 	${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS -c "$srcdir"/__stack_chk_fail_local.c -o __stack_chk_fail_local.o || return 1
@@ -73,7 +72,7 @@ build() {
 package() {
 	cd "$builddir"
 
-	if [ "$BOOTSTRAP" == "nocc" ]; then
+	if [ "$BOOTSTRAP" = "nocc" ]; then
 		case "$CARCH" in
 		aarch64*)	ARCH="aarch64" ;;
 		arm*)		ARCH="arm" ;;
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index de2cf7e4ed5924ddacb9fc7565288252a2223b52..93a1e1a36f1d2d11b5a8ecf7d344632540bc5873 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -66,7 +66,7 @@ fi
 msg "Building cross-compiler"
 
 # Build and install cross binutils (--with-sysroot)
-CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname binutils) abuild -r
+CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname binutils) abuild -r
 
 if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up2date 2>/dev/null; then
 	# C-library headers for target
@@ -83,10 +83,10 @@ fi
 
 # Full cross GCC
 EXTRADEPENDS_TARGET="musl musl-dev" \
-CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname gcc) abuild -r -k
+CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname gcc) abuild -r
 
 # Cross build-base
-CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname build-base) abuild -r
+CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname build-base) abuild -r
 
 msg "Cross building base system"