02/04: gnu: gcc: Do not add -rpath=LIBDIR/lib64 to the "lib" spec.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 811974925de0052e8a4294c3bb24cc87468bc923
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jun 9 21:39:10 2015 +0200

    gnu: gcc: Do not add -rpath=LIBDIR/lib64 to the "lib" spec.
    
    * gnu/packages/gcc.scm (gcc-4.7): Remove unneeded LIBDIR/lib64 from
      GNU_USER_TARGET_LIB_SPEC.
---
 gnu/packages/gcc.scm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 8804f3b..29be4e2 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -235,8 +235,8 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
                    ;; below, make sure to update the relevant code in
                    ;; %gcc-static package as needed.
                    (format #f "#define GNU_USER_TARGET_LIB_SPEC \
-\"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib64 
-rpath=~a/lib -lgcc_s}} \" ~a"
-                           libc libc libdir libdir suffix))
+\"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" 
~a"
+                           libc libc libdir suffix))
                   (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
                    (format #f "#define STANDARD_STARTFILE_PREFIX_1 \"~a/lib\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"