--- a	2021-10-09 20:59:28.977394444 -0500
+++ b	2021-10-09 21:00:09.470414858 -0500
@@ -1363,7 +1363,7 @@
 	local rpaths=$(cat "$1")
 	shift
 	while [ $# -gt 0 ]; do
-		real_so_path "$1" /usr/lib /lib $rpaths || return 1
+		real_so_path "$1" /usr/lib /lib $(ldd /tmp/m32/host/bin/gcc | grep -oE '/.*\ ' | xargs -I {} dirname {} | sort | uniq) $rpaths || return 1
 		shift
 	done
 	return 0
@@ -1396,7 +1396,7 @@
 	local apkroot=
 
 	case "$parch" in
-	$CBUILD_ARCH) ;;
+	$CBUILD_ARCH) apkroot="--root $CBUILDROOT" ;;
 	$CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT --arch $CTARGET_ARCH" ;;
 	esac