~ruther/guix-local: distro: gcc: Adjust to support non-x86_64 architectures.

fc95fdaebe5f99ceb6ad0ea5fe0d8ea44ba92aab — Ludovic Courtès 13 years ago 20d8344

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

* 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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 4 deletions(-)

M distro/packages/base.scm

M distro/packages/base.scm => distro/packages/base.scm +4 -4

@@ 751,7 751,8 @@ BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
                  ;; cross-compiler builds.
 
                  ;; 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)
                     (format #f "#define GLIBC_DYNAMIC_LINKER~a \"~a\"~%"
                             suffix


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