From 762916811493e3b565a0b3fcb393abe638134c38 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 24 Dec 2020 00:02:57 +0100
Subject: [PATCH] cross-x86_64-linux-gnu: clean up libdir handling

---
 srcpkgs/cross-x86_64-linux-gnu/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index 517aac977ac..4a6928076a7 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -192,7 +192,7 @@ _glibc_build() {
 	[ ! -d glibc-build ] && mkdir glibc-build
 	cd glibc-build
 
-	echo "slibdir=/usr/lib" > configparms
+	echo "slibdir=/usr/lib64" > configparms
 
 	echo "libc_cv_forced_unwind=yes" > config.cache
 	echo "libc_cv_c_cleanup=yes" >> config.cache
@@ -203,7 +203,7 @@ _glibc_build() {
 	export CFLAGS="-O2 -pipe"
 
 	_args="--prefix=/usr"
-	_args+=" --libdir=/usr/lib"
+	_args+=" --libdir=/usr/lib64"
 	_args+=" --host=${_triplet}"
 	_args+=" --with-headers=${_sysroot}/usr/include"
 	_args+=" --config-cache"
@@ -290,6 +290,8 @@ do_build() {
 			ln -sfr ${_sysroot}/usr/${f} ${_sysroot}/${f}
 		fi
 	done
+	ln -sf lib ${_sysroot}/usr/lib64
+	ln -sf usr/lib ${_sysroot}/lib64
 
 	_binutils_build
 	_gcc_bootstrap
@@ -309,10 +311,8 @@ do_install() {
 				${DESTDIR}/${_sysroot}/${f}
 		fi
 	done
-	mkdir -p ${DESTDIR}/${_sysroot}/usr/lib
 	ln -sf lib ${DESTDIR}/${_sysroot}/usr/lib64
 	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib64
-	ln -sf usr/lib ${DESTDIR}/${_sysroot}/lib
 
 	# install linux API headers for x86
 	cd ${wrksrc}/linux-${_linux_version}