From 70cecb9cbdc7684885e348e2e82308f8da373953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 May 2016 10:49:00 +0200
Subject: [PATCH] gcc: fix #15033: avoid lib64/ symlink to 32-bit lib/

This was caused by me in 90ee003240.
---
 pkgs/development/compilers/gcc/builder.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 5b206a63daa..22107e72ef7 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -201,23 +201,20 @@ postConfigure() {
 
 
 preInstall() {
-    # Make ‘lib64’ a symlink to ‘lib’.
+    # Make ‘lib64’ symlinks to ‘lib’.
     if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
-        mkdir -p $out/lib
-        ln -s lib $out/lib64
+        mkdir -p "$out/lib"
+        ln -s lib "$out/lib64"
+        mkdir -p "$lib/lib"
+        ln -s lib "$lib/lib64"
     fi
 }
 
 
 postInstall() {
-    mkdir -p "$lib" # some configs don't have anything to put into $lib
-
     # Move runtime libraries to $lib.
     moveToOutput "lib/lib*.so*" "$lib"
     moveToOutput "lib/lib*.la"  "$lib"
-    if [ -d "$lib/lib" ]; then
-        ln -s lib "$lib/lib64" # for *.la
-    fi
     moveToOutput "share/gcc-*/python" "$lib"
 
     for i in "$lib"/lib/*.{la,py}; do