me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gcc: Adjust for "alpha-linux".

Browse source 
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 <slyfox@inbox.ru>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Sergei Trofimovich 2017-02-19 19:21:06 +00:00 • committed by Ludovic Courtès
parent 480da86d09
commit bd54c5e3fa
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/gcc.scm
View file

@ -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