diff --git a/build-package.sh b/build-package.sh
index be0f2891f..fbb935120 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -62,204 +62,7 @@ source scripts/build/termux_step_handle_hostbuild.sh
 source scripts/build/termux_step_host_build.sh
 
 # Setup a standalone Android NDK toolchain. Not to be overridden by packages.
-termux_step_setup_toolchain() {
-	# We put this after system PATH to avoid picking up toolchain stripped python
-	export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
-
-	export CFLAGS=""
-	export LDFLAGS="-L${TERMUX_PREFIX}/lib"
-
-	export AS=${TERMUX_HOST_PLATFORM}-clang
-	export CC=$TERMUX_HOST_PLATFORM-clang
-	export CXX=$TERMUX_HOST_PLATFORM-clang++
-
-	export CCTERMUX_HOST_PLATFORM=$TERMUX_HOST_PLATFORM$TERMUX_PKG_API_LEVEL
-	if [ $TERMUX_ARCH = arm ]; then
-	       CCTERMUX_HOST_PLATFORM=armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL
-	fi
-	export AR=$TERMUX_HOST_PLATFORM-ar
-	export CPP=${TERMUX_HOST_PLATFORM}-cpp
-	export CC_FOR_BUILD=gcc
-	export LD=$TERMUX_HOST_PLATFORM-ld
-	export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump
-	# Setup pkg-config for cross-compiling:
-	export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config
-	export RANLIB=$TERMUX_HOST_PLATFORM-ranlib
-	export READELF=$TERMUX_HOST_PLATFORM-readelf
-	export STRIP=$TERMUX_HOST_PLATFORM-strip
-
-	# Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want
-	# LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags"
-	# and no longer remove DT_RUNPATH in termux-elf-cleaner.
-
-	if [ "$TERMUX_ARCH" = "arm" ]; then
-		# https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility:
-		# "We recommend using the -mthumb compiler flag to force the generation of 16-bit Thumb-2 instructions".
-		# With r13 of the ndk ruby 2.4.0 segfaults when built on arm with clang without -mthumb.
-		CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb"
-		LDFLAGS+=" -march=armv7-a"
-	elif [ "$TERMUX_ARCH" = "i686" ]; then
-		# From $NDK/docs/CPU-ARCH-ABIS.html:
-		CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"
-	elif [ "$TERMUX_ARCH" = "aarch64" ]; then
-		:
-	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
-		:
-	else
-		termux_error_exit "Invalid arch '$TERMUX_ARCH' - support arches are 'arm', 'i686', 'aarch64', 'x86_64'"
-	fi
-
-	if [ -n "$TERMUX_DEBUG" ]; then
-		CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-	else
-		if [ $TERMUX_ARCH = arm ]; then
-			CFLAGS+=" -Os"
-		else
-			CFLAGS+=" -Oz"
-		fi
-	fi
-
-	export CXXFLAGS="$CFLAGS"
-	export CPPFLAGS="-I${TERMUX_PREFIX}/include"
-
-	# If libandroid-support is declared as a dependency, link to it explicitly:
-	if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
-		LDFLAGS+=" -landroid-support"
-	fi
-
-	export ac_cv_func_getpwent=no
-	export ac_cv_func_getpwnam=no
-	export ac_cv_func_getpwuid=no
-	export ac_cv_func_sigsetmask=no
-	export ac_cv_c_bigendian=no
-
-	if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
-		# Do not put toolchain in place until we are done with setup, to avoid having a half setup
-		# toolchain left in place if something goes wrong (or process is just aborted):
-		local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
-		rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR
-
-		local _NDK_ARCHNAME=$TERMUX_ARCH
-		if [ "$TERMUX_ARCH" = "aarch64" ]; then
-			_NDK_ARCHNAME=arm64
-		elif [ "$TERMUX_ARCH" = "i686" ]; then
-			_NDK_ARCHNAME=x86
-		fi
-
-		"$NDK/build/tools/make_standalone_toolchain.py" \
-			--api "$TERMUX_PKG_API_LEVEL" \
-			--arch $_NDK_ARCHNAME \
-			--stl=libc++ \
-			--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
-
-		# Remove android-support header wrapping not needed on android-21:
-		rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local
-
-		if [ "$TERMUX_ARCH" = "aarch64" ]; then
-			# Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
-			cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
-			    $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
-			cp $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld.gold \
-			    $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld
-		fi
-
-		if [ "$TERMUX_ARCH" = "arm" ]; then
-			# Linker wrapper script to add '--exclude-libs libgcc.a', see
-			# https://github.com/android-ndk/ndk/issues/379
-			# https://android-review.googlesource.com/#/c/389852/
-			local linker
-			for linker in ld ld.bfd ld.gold; do
-				local wrap_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker
-				local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker.real
-				cp $wrap_linker $real_linker
-				echo '#!/bin/bash' > $wrap_linker
-				echo -n '$(dirname $0)/' >> $wrap_linker
-				echo -n $linker.real >> $wrap_linker
-				echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker
-			done
-		fi
-
-		# Setup the cpp preprocessor:
-		cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-clang \
-		   $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-cpp
-		sed -i 's/clang80/clang80 -E/' \
-		   $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-cpp
-
-		cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
-
-		for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do
-			sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \
-				sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
-				patch --silent -p1;
-		done
-		# elf.h: Taken from glibc since the elf.h in the NDK is lacking.
-		# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
-		# langinfo.h: Inline implementation of nl_langinfo().
-		# iconv.h: Header for iconv, implemented in libandroid-support.
-		cp "$TERMUX_SCRIPTDIR"/ndk-patches/{ifaddrs.h,libintl.h,langinfo.h,iconv.h} usr/include
-
-		# Remove <sys/shm.h> from the NDK in favour of that from the libandroid-shmem.
-		# Remove <sys/sem.h> as it doesn't work for non-root.
-		# Remove <glob.h> as we currently provide it from libandroid-glob.
-		# Remove <spawn.h> as it's only for future (later than android-27).
-		rm usr/include/sys/{shm.h,sem.h} usr/include/{glob.h,spawn.h}
-
-		sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
-			usr/include/android/api-level.h
-
-		$TERMUX_ELF_CLEANER usr/lib/*/*/*.so
-
-		# zlib is really version 1.2.8 in the Android platform (at least
-		# starting from Android 5), not older as the NDK headers claim.
-		for file in zconf.h zlib.h; do
-			curl -o usr/include/$file \
-				https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file
-		done
-		unset file
-		grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>'   | xargs -n 1 sed -i 's/<version>/\"version\"/g'
-		mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
-	fi
-
-	local _STL_LIBFILE_NAME=libc++_shared.so
-	if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
-		# Setup libc++_shared.so in $PREFIX/lib and libstdc++.so as a link to it,
-		# so that other C++ using packages links to it instead of the default android
-		# C++ library which does not support exceptions or STL:
-		# https://developer.android.com/ndk/guides/cpp-support.html
-		# We do however want to avoid installing this, to avoid problems where e.g.
-		# libm.so on some i686 devices links against libstdc++.so.
-		# The libc++_shared.so library will be packaged in the libc++ package
-		# which is part of the base Termux installation.
-		mkdir -p "$TERMUX_PREFIX/lib"
-		cd "$TERMUX_PREFIX/lib"
-
-		local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${TERMUX_HOST_PLATFORM}/$_STL_LIBFILE_NAME
-
-		cp "$_STL_LIBFILE" .
-		$STRIP --strip-unneeded $_STL_LIBFILE_NAME
-		$TERMUX_ELF_CLEANER $_STL_LIBFILE_NAME
-		if [ $TERMUX_ARCH = "arm" ]; then
-			# Use a linker script to get libunwind.a.
-			echo 'INPUT(-lunwind -lc++_shared)' > libstdc++.so
-		else
-			ln -f $_STL_LIBFILE_NAME libstdc++.so
-		fi
-	fi
-
-	export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
-	# Create a pkg-config wrapper. We use path to host pkg-config to
-	# avoid picking up a cross-compiled pkg-config later on.
-	local _HOST_PKGCONFIG
-	_HOST_PKGCONFIG=$(which pkg-config)
-	mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin "$PKG_CONFIG_LIBDIR"
-	cat > "$PKG_CONFIG" <<-HERE
-		#!/bin/sh
-		export PKG_CONFIG_DIR=
-		export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
-		exec $_HOST_PKGCONFIG "\$@"
-	HERE
-	chmod +x "$PKG_CONFIG"
-}
+source scripts/build/termux_step_setup_toolchain.sh
 
 # Apply all *.patch files for the package. Not to be overridden by packages.
 termux_step_patch_package() {
diff --git a/scripts/build/termux_step_setup_toolchain.sh b/scripts/build/termux_step_setup_toolchain.sh
new file mode 100644
index 000000000..4ca48dcf4
--- /dev/null
+++ b/scripts/build/termux_step_setup_toolchain.sh
@@ -0,0 +1,198 @@
+termux_step_setup_toolchain() {
+	# We put this after system PATH to avoid picking up toolchain stripped python
+	export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
+
+	export CFLAGS=""
+	export LDFLAGS="-L${TERMUX_PREFIX}/lib"
+
+	export AS=${TERMUX_HOST_PLATFORM}-clang
+	export CC=$TERMUX_HOST_PLATFORM-clang
+	export CXX=$TERMUX_HOST_PLATFORM-clang++
+
+	export CCTERMUX_HOST_PLATFORM=$TERMUX_HOST_PLATFORM$TERMUX_PKG_API_LEVEL
+	if [ $TERMUX_ARCH = arm ]; then
+	       CCTERMUX_HOST_PLATFORM=armv7a-linux-androideabi$TERMUX_PKG_API_LEVEL
+	fi
+	export AR=$TERMUX_HOST_PLATFORM-ar
+	export CPP=${TERMUX_HOST_PLATFORM}-cpp
+	export CC_FOR_BUILD=gcc
+	export LD=$TERMUX_HOST_PLATFORM-ld
+	export OBJDUMP=$TERMUX_HOST_PLATFORM-objdump
+	# Setup pkg-config for cross-compiling:
+	export PKG_CONFIG=$TERMUX_STANDALONE_TOOLCHAIN/bin/${TERMUX_HOST_PLATFORM}-pkg-config
+	export RANLIB=$TERMUX_HOST_PLATFORM-ranlib
+	export READELF=$TERMUX_HOST_PLATFORM-readelf
+	export STRIP=$TERMUX_HOST_PLATFORM-strip
+
+	# Android 7 started to support DT_RUNPATH (but not DT_RPATH), so we may want
+	# LDFLAGS+="-Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags"
+	# and no longer remove DT_RUNPATH in termux-elf-cleaner.
+
+	if [ "$TERMUX_ARCH" = "arm" ]; then
+		# https://developer.android.com/ndk/guides/standalone_toolchain.html#abi_compatibility:
+		# "We recommend using the -mthumb compiler flag to force the generation of 16-bit Thumb-2 instructions".
+		# With r13 of the ndk ruby 2.4.0 segfaults when built on arm with clang without -mthumb.
+		CFLAGS+=" -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mthumb"
+		LDFLAGS+=" -march=armv7-a"
+	elif [ "$TERMUX_ARCH" = "i686" ]; then
+		# From $NDK/docs/CPU-ARCH-ABIS.html:
+		CFLAGS+=" -march=i686 -msse3 -mstackrealign -mfpmath=sse"
+	elif [ "$TERMUX_ARCH" = "aarch64" ]; then
+		:
+	elif [ "$TERMUX_ARCH" = "x86_64" ]; then
+		:
+	else
+		termux_error_exit "Invalid arch '$TERMUX_ARCH' - support arches are 'arm', 'i686', 'aarch64', 'x86_64'"
+	fi
+
+	if [ -n "$TERMUX_DEBUG" ]; then
+		CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+	else
+		if [ $TERMUX_ARCH = arm ]; then
+			CFLAGS+=" -Os"
+		else
+			CFLAGS+=" -Oz"
+		fi
+	fi
+
+	export CXXFLAGS="$CFLAGS"
+	export CPPFLAGS="-I${TERMUX_PREFIX}/include"
+
+	# If libandroid-support is declared as a dependency, link to it explicitly:
+	if [ "$TERMUX_PKG_DEPENDS" != "${TERMUX_PKG_DEPENDS/libandroid-support/}" ]; then
+		LDFLAGS+=" -landroid-support"
+	fi
+
+	export ac_cv_func_getpwent=no
+	export ac_cv_func_getpwnam=no
+	export ac_cv_func_getpwuid=no
+	export ac_cv_func_sigsetmask=no
+	export ac_cv_c_bigendian=no
+
+	if [ ! -d $TERMUX_STANDALONE_TOOLCHAIN ]; then
+		# Do not put toolchain in place until we are done with setup, to avoid having a half setup
+		# toolchain left in place if something goes wrong (or process is just aborted):
+		local _TERMUX_TOOLCHAIN_TMPDIR=${TERMUX_STANDALONE_TOOLCHAIN}-tmp
+		rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR
+
+		local _NDK_ARCHNAME=$TERMUX_ARCH
+		if [ "$TERMUX_ARCH" = "aarch64" ]; then
+			_NDK_ARCHNAME=arm64
+		elif [ "$TERMUX_ARCH" = "i686" ]; then
+			_NDK_ARCHNAME=x86
+		fi
+
+		"$NDK/build/tools/make_standalone_toolchain.py" \
+			--api "$TERMUX_PKG_API_LEVEL" \
+			--arch $_NDK_ARCHNAME \
+			--stl=libc++ \
+			--install-dir $_TERMUX_TOOLCHAIN_TMPDIR
+
+		# Remove android-support header wrapping not needed on android-21:
+		rm -Rf $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/local
+
+		if [ "$TERMUX_ARCH" = "aarch64" ]; then
+			# Use gold by default to work around https://github.com/android-ndk/ndk/issues/148
+			cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld.gold \
+			    $_TERMUX_TOOLCHAIN_TMPDIR/bin/aarch64-linux-android-ld
+			cp $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld.gold \
+			    $_TERMUX_TOOLCHAIN_TMPDIR/aarch64-linux-android/bin/ld
+		fi
+
+		if [ "$TERMUX_ARCH" = "arm" ]; then
+			# Linker wrapper script to add '--exclude-libs libgcc.a', see
+			# https://github.com/android-ndk/ndk/issues/379
+			# https://android-review.googlesource.com/#/c/389852/
+			local linker
+			for linker in ld ld.bfd ld.gold; do
+				local wrap_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker
+				local real_linker=$_TERMUX_TOOLCHAIN_TMPDIR/$TERMUX_HOST_PLATFORM/bin/$linker.real
+				cp $wrap_linker $real_linker
+				echo '#!/bin/bash' > $wrap_linker
+				echo -n '$(dirname $0)/' >> $wrap_linker
+				echo -n $linker.real >> $wrap_linker
+				echo ' --exclude-libs libgcc.a "$@"' >> $wrap_linker
+			done
+		fi
+
+		# Setup the cpp preprocessor:
+		cp $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-clang \
+		   $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-cpp
+		sed -i 's/clang80/clang80 -E/' \
+		   $_TERMUX_TOOLCHAIN_TMPDIR/bin/$TERMUX_HOST_PLATFORM-cpp
+
+		cd $_TERMUX_TOOLCHAIN_TMPDIR/sysroot
+
+		for f in $TERMUX_SCRIPTDIR/ndk-patches/*.patch; do
+			sed "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" "$f" | \
+				sed "s%\@TERMUX_HOME\@%${TERMUX_ANDROID_HOME}%g" | \
+				patch --silent -p1;
+		done
+		# elf.h: Taken from glibc since the elf.h in the NDK is lacking.
+		# ifaddrs.h: Added in android-24 unified headers, use a inline implementation for now.
+		# langinfo.h: Inline implementation of nl_langinfo().
+		# iconv.h: Header for iconv, implemented in libandroid-support.
+		cp "$TERMUX_SCRIPTDIR"/ndk-patches/{ifaddrs.h,libintl.h,langinfo.h,iconv.h} usr/include
+
+		# Remove <sys/shm.h> from the NDK in favour of that from the libandroid-shmem.
+		# Remove <sys/sem.h> as it doesn't work for non-root.
+		# Remove <glob.h> as we currently provide it from libandroid-glob.
+		# Remove <spawn.h> as it's only for future (later than android-27).
+		rm usr/include/sys/{shm.h,sem.h} usr/include/{glob.h,spawn.h}
+
+		sed -i "s/define __ANDROID_API__ __ANDROID_API_FUTURE__/define __ANDROID_API__ $TERMUX_PKG_API_LEVEL/" \
+			usr/include/android/api-level.h
+
+		$TERMUX_ELF_CLEANER usr/lib/*/*/*.so
+
+		# zlib is really version 1.2.8 in the Android platform (at least
+		# starting from Android 5), not older as the NDK headers claim.
+		for file in zconf.h zlib.h; do
+			curl -o usr/include/$file \
+				https://raw.githubusercontent.com/madler/zlib/v1.2.8/$file
+		done
+		unset file
+		grep -lrw $_TERMUX_TOOLCHAIN_TMPDIR/sysroot/usr/include/c++/v1 -e '<version>'   | xargs -n 1 sed -i 's/<version>/\"version\"/g'
+		mv $_TERMUX_TOOLCHAIN_TMPDIR $TERMUX_STANDALONE_TOOLCHAIN
+	fi
+
+	local _STL_LIBFILE_NAME=libc++_shared.so
+	if [ ! -f $TERMUX_PREFIX/lib/libstdc++.so ]; then
+		# Setup libc++_shared.so in $PREFIX/lib and libstdc++.so as a link to it,
+		# so that other C++ using packages links to it instead of the default android
+		# C++ library which does not support exceptions or STL:
+		# https://developer.android.com/ndk/guides/cpp-support.html
+		# We do however want to avoid installing this, to avoid problems where e.g.
+		# libm.so on some i686 devices links against libstdc++.so.
+		# The libc++_shared.so library will be packaged in the libc++ package
+		# which is part of the base Termux installation.
+		mkdir -p "$TERMUX_PREFIX/lib"
+		cd "$TERMUX_PREFIX/lib"
+
+		local _STL_LIBFILE=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr/lib/${TERMUX_HOST_PLATFORM}/$_STL_LIBFILE_NAME
+
+		cp "$_STL_LIBFILE" .
+		$STRIP --strip-unneeded $_STL_LIBFILE_NAME
+		$TERMUX_ELF_CLEANER $_STL_LIBFILE_NAME
+		if [ $TERMUX_ARCH = "arm" ]; then
+			# Use a linker script to get libunwind.a.
+			echo 'INPUT(-lunwind -lc++_shared)' > libstdc++.so
+		else
+			ln -f $_STL_LIBFILE_NAME libstdc++.so
+		fi
+	fi
+
+	export PKG_CONFIG_LIBDIR="$TERMUX_PKG_CONFIG_LIBDIR"
+	# Create a pkg-config wrapper. We use path to host pkg-config to
+	# avoid picking up a cross-compiled pkg-config later on.
+	local _HOST_PKGCONFIG
+	_HOST_PKGCONFIG=$(which pkg-config)
+	mkdir -p $TERMUX_STANDALONE_TOOLCHAIN/bin "$PKG_CONFIG_LIBDIR"
+	cat > "$PKG_CONFIG" <<-HERE
+		#!/bin/sh
+		export PKG_CONFIG_DIR=
+		export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR
+		exec $_HOST_PKGCONFIG "\$@"
+	HERE
+	chmod +x "$PKG_CONFIG"
+}