From 2646b6ebde391e034caa7d3a90a638c061367084 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Dec 2020 20:02:24 +0100
Subject: [PATCH] gcc: remove wordsize libdir trickery now handled by hook

---
 srcpkgs/gcc/template | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 94e303d58ff..9461bb6b10e 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -224,7 +224,7 @@ do_configure() {
 		_args+=" --enable-sjlj-exceptions=no"
 		_langs+=",objc,obj-c++,fortran"
 	elif [ -z "$CHROOT_READY" ]; then
-		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
+		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}"
 		_args+=" --build=${_triplet}"
 	else
 		_langs="c,c++,objc,obj-c++,fortran,lto"
@@ -258,8 +258,8 @@ do_configure() {
 	_args+=" --prefix=/usr"
 	_args+=" --mandir=/usr/share/man"
 	_args+=" --infodir=/usr/share/info"
-	_args+=" --libexecdir=/usr/lib"
-	_args+=" --libdir=/usr/lib"
+	_args+=" --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
 	_args+=" --enable-threads=posix"
 	_args+=" --enable-__cxa_atexit"
 	_args+=" --disable-multilib"
@@ -308,7 +308,7 @@ do_configure() {
 }
 do_build() {
 	if [ -z "$CHROOT_READY" ]; then
-		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib"
+		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}"
 	fi
 	cd build
 	if [ "$build_option_gnatboot" ]; then
@@ -331,12 +331,7 @@ pre_install() {
 }
 do_install() {
 	cd build
-	case "$XBPS_TARGET_MACHINE" in
-	x86_64*|aarch64*|ppc64*)
-		vmkdir usr/lib
-		ln -sfr ${DESTDIR}/usr/lib ${DESTDIR}/usr/lib64
-		;;
-	esac
+
 	make DESTDIR=${DESTDIR} install
 
 	# Make version a symlink of major version to make all versions
@@ -362,10 +357,6 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/liblto_plugin.so \
 		${DESTDIR}/usr/lib/bfd-plugins
 
-	if [ -e ${DESTDIR}/usr/lib64 ]; then
-		rm -f ${DESTDIR}/usr/lib64
-	fi
-
 	# Remove "fixed" header
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085
 	rm -vf ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/include-fixed/bits/statx.h