cross-i686-pc-linux-gnu: clean up libdir handling

srcpkgs/cross-i686-pc-linux-gnu/template

@@ -193,6 +193,8 @@ _glibc_build() {
 	[ ! -d glibc-build ] && mkdir glibc-build
 	cd glibc-build
 
+	echo "slibdir=/usr/lib32" > configparms
+
 	echo "libc_cv_forced_unwind=yes" > config.cache
 	echo "libc_cv_c_cleanup=yes" >> config.cache
 	echo "libc_cv_ssp=no" >> config.cache
@@ -202,6 +204,7 @@ _glibc_build() {
 	export CFLAGS="-O2 -pipe -Wno-error ${_archflags}"
 	_args="--host=${_triplet}"
 	_args+=" --prefix=/usr"
+	_args+=" --libdir=/usr/lib32"
 	_args+=" --with-headers=${_sysroot}/usr/include"
 	_args+=" --config-cache"
 	_args+=" --enable-obsolete-rpc"
@@ -233,7 +236,9 @@ _gcc_build() {
 	# Make this link to target libs.
 	if [ ! -f .sed_subst_done ]; then
 		sed -e "s, /lib/, ${_sysroot}/lib/,g;s, /usr/lib/, ${_sysroot}/usr/lib/,g" \
-			-i ${_sysroot}/lib/libc.so ${_sysroot}/lib/libpthread.so
+			-i ${_sysroot}/lib/libc.so
+		sed -e "s, /lib32/, ${_sysroot}/lib32/,g;s, /usr/lib32/, ${_sysroot}/usr/lib32/,g" \
+			-i ${_sysroot}/lib/libc.so
 		touch .sed_subst_done
 	fi
 	_args="--target=${_triplet}"
@@ -292,6 +297,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib32
+	ln -sf usr/lib ${_sysroot}/lib32
 
 	_binutils_build
 	_gcc_bootstrap
@@ -311,6 +318,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib32
+	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib32
 
 	# install cross binutils
 	cd ${wrksrc}/binutils-build