me/guix
Archived
1
0
Fork 0
Code Activity

distro: gcc: Adjust to support non-x86_64 architectures.

Browse source 
* distro/packages/base.scm (gcc-4.7)[arguments]: In the `pre-configure'
  phase, patch all the relevant gcc/config files, not just those for
  x86_64-linux-gnu.
This commit is contained in:
Ludovic Courtès 2012-10-26 18:51:22 +02:00
parent 20d83444dd
commit fc95fdaebe
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
distro/packages/base.scm
View file

@ -751,7 +751,8 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
;; cross-compiler builds. ;; cross-compiler builds.
;; Fix the dynamic linker's file name. ;; Fix the dynamic linker's file name.
(substitute* "gcc/config/i386/linux64.h" (substitute* (find-files "gcc/config"
"^linux(64|-elf)?\\.h$")
(("#define GLIBC_DYNAMIC_LINKER([^ ]*).*$" _ suffix) (("#define GLIBC_DYNAMIC_LINKER([^ ]*).*$" _ suffix)
(format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%" (format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%"
suffix suffix
@ -759,9 +760,8 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
;; Tell where to find libstdc++, libc, and `?crt*.o', except ;; Tell where to find libstdc++, libc, and `?crt*.o', except
;; `crt{begin,end}.o', which come with GCC. ;; `crt{begin,end}.o', which come with GCC.
(substitute* '("gcc/config/gnu-user.h" (substitute* (find-files "gcc/config"
"gcc/config/i386/gnu-user.h" "^(gnu-user(64)?|linux-elf)\\.h$")
"gcc/config/i386/gnu-user64.h")
(("#define LIB_SPEC (.*)$" _ suffix) (("#define LIB_SPEC (.*)$" _ suffix)
(format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \ (format #f "#define LIB_SPEC \"-L~a/lib -rpath=~a/lib \
-rpath=~a/lib64 -rpath=~a/lib \" ~a~%" -rpath=~a/lib64 -rpath=~a/lib \" ~a~%"