02/02: gnu: gcc: Fix cross-compilation to GNU/Hurd.

[Ludovic Courtès]

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

commit ec6ba5c1fe9308cbc18f06c99adcfe0d13396a18
Author: Ludovic Courtès <address@hidden>
Date:   Sun Dec 31 01:18:34 2017 +0100

    gnu: gcc: Fix cross-compilation to GNU/Hurd.
    
    * gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Return
    "--disable-libcilkrts" when TARGET matches "-gnu".
---
 gnu/packages/gcc.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 7f4cf8a..8b0050d 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -65,6 +65,14 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
            "--with-mode=thumb"
            "--with-fpu=neon"))
 
+        ((and (string-suffix? "-gnu" target)
+              (not (string-contains target "-linux")))
+         ;; Cross-compilation of libcilkrts in GCC 5.5.0 to GNU/Hurd fails
+         ;; with:
+         ;;   libcilkrts/runtime/os-unix.c:388:2: error: #error "Unknown 
architecture"
+         ;; Cilk has been removed from GCC 8 anyway.
+         '("--disable-libcilkrts"))
+
         (else
          ;; TODO: Add `arm.*-gnueabi', etc.
          '())))