From 51c39a88e76551ffa63ffbc087a860ff94d4c6a8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 15 Apr 2013 16:51:30 +0200
Subject: [PATCH] gcc: fix multilib build.

---
 srcpkgs/gcc/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 104deb5ae0..6249822ee8 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -127,8 +127,11 @@ gcc-c++-multilib_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove usr/lib32/libstdc++.a
-		vmove usr/lib32/libsupc++.a
+		vmkdir usr/lib/gcc/${_triplet}/${_majorver}/32
+		mv ${DESTDIR}/usr/lib32/libstdc++.a \
+			${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/32
+		mv ${DESTDIR}/usr/lib32/libsupc++.a \
+			${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/32
 	}
 }
 
@@ -140,7 +143,7 @@ gcc-multilib_package() {
 	pkg_install() {
 		vmove usr/lib/gcc/${_triplet}/${_majorver}/32
 		vmove "usr/lib32/libssp*.a"
-		vinstall ${wrksrc}/host-${_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}/32
+		vinstall ${wrksrc}/host-${_triplet}/gcc/specs 644 usr/lib/gcc/${_triplet}/${_majorver}
 	}
 }
 
@@ -150,7 +153,9 @@ gcc-objc-multilib_package() {
 	noverifyrdeps=yes
 
 	pkg_install() {
-		vmove "usr/lib32/libobjc*.a"
+		vmkdir usr/lib/gcc/${_triplet}/${_majorver}/32
+		mv ${DESTDIR}/usr/lib32/libobjc*.a \
+			${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/32
 	}
 }