01/02: gnu: gcc: Adjust for "alpha-linux".

[Ludovic Courtès]

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

commit bd54c5e3faa9fc46b00428be2f7a5e16afc64f5e
Author: Sergei Trofimovich <address@hidden>
Date:   Sun Feb 19 19:21:06 2017 +0000

    gnu: gcc: Adjust for "alpha-linux".
    
    This change allows cross-building packages by just
    using --target=alpha-unknown-linux-gnu re2c:
    
      $ ./pre-inst-env guix build --target=alpha-unknown-linux-gnu re2c
      $ file /gnu/store/p1z9iszzb4ng0vzc535sc2ha33ax24l6-re2c-0.16/bin/re2c
      /gnu/store/p1z9iszzb4ng0vzc535sc2ha33ax24l6-re2c-0.16/bin/re2c: \
          ELF 64-bit LSB executable, Alpha (unofficial), version 1 (SYSV), 
dynamically linked, \
          interpreter 
/gnu/store/0z5d6z3hh41w7z5g2g82zlnwgpbj0i1a-glibc-cross-alpha-unknown-linux-gnu-2.24/lib/ld-linux.so.2,
 \
          for GNU/Linux 3.2.0, not stripped
    
    GCC for alpha uses 'GLIBC_DYNAMIC_LINKER<TAB>"/lib/ld-linux.so.2"'
    
    * gnu/packages/gcc.scm (gcc-4.7)[arguments]: Fix GLIBC_DYNAMIC_LINKER
    substitution when delimiter is a tab.
    
    Signed-off-by: Sergei Trofimovich <address@hidden>
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/gcc.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 00e2fa7..0fdb5ca 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -213,7 +213,7 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
                 ;; Fix the dynamic linker's file name.
                 (substitute* (find-files "gcc/config"
                                          
"^(linux|gnu|sysv4)(64|-elf|-eabi)?\\.h$")
-                  (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ ]*).*$"
+                  (("#define (GLIBC|GNU_USER)_DYNAMIC_LINKER([^ \t]*).*$"
                     _ gnu-user suffix)
                    (format #f "#define ~a_DYNAMIC_LINKER~a \"~a\"~%"
                            gnu-user suffix