05/16: gnu: gcc: Also substitute the dynamic linker name for GNU (ie. Hurd) systems.

[Manolis Fragkiskos Ragkousis]

phant0mas pushed a commit to branch wip-hurd
in repository guix.

commit f76ea0df652ee2311d5b093bb2ccd17851697adf
Author: Marek Benc <address@hidden>
Date:   Thu Feb 5 17:12:54 2015 +0100

    gnu: gcc: Also substitute the dynamic linker name for GNU (ie. Hurd) 
systems.
    
    * gnu/packages/gcc.scm (gcc-4.7): Also substitute the dynamic linker name
      for GNU (ie. Hurd) systems.
    
    Signed-off-by: Manolis Ragkousis <address@hidden>
---
 gnu/packages/gcc.scm |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 6aa0942..25e23ce 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -212,6 +212,13 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
                            suffix
                            (string-append libc ,(glibc-dynamic-linker)))))
 
+                (substitute* (find-files "gcc/config"
+                                         "^gnu(64|-elf)?\\.h$")
+                  (("#define GNU_USER_DYNAMIC_LINKER([^ ]*).*$" _ suffix)
+                   (format #f "#define GNU_USER_DYNAMIC_LINKER~a \"~a\"~%"
+                           suffix
+                           (string-append libc ,(glibc-dynamic-linker)))))
+
                 ;; Tell where to find libstdc++, libc, and `?crt*.o', except
                 ;; `crt{begin,end}.o', which come with GCC.
                 (substitute* (find-files "gcc/config"