~ruther/guix-local: gnu: cross-libc: Resurrect cross-building for the Hurd.

d108a7aac2c51f21c55cb8ea8801629a97f5242a — Janneke Nieuwenhuizen 1 year, 11 months ago 9413345

gnu: cross-libc: Resurrect cross-building for the Hurd.

* gnu/packages/base.scm (glibc)[arguments]: When building for the Hurd, in
phase "create-machine-symlink", only create symlink if it is missing.
* gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise.

Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812

patch browse .tar.gz .zip

2 files changed, 12 insertions(+), 10 deletions(-)

M gnu/packages/base.scm
M gnu/packages/cross-base.scm

M gnu/packages/base.scm => gnu/packages/base.scm +6 -5

@@ 1088,11 1088,12 @@ the store.")
                                                  " libmachuser.so libhurduser.so"))))))
                          (add-after 'install 'create-machine-symlink
                            (lambda* (#:key outputs #:allow-other-keys)
-                             (let ((out (assoc-ref outputs "out"))
-                                   (cpu "i386"))
-                               (symlink cpu
-                                        (string-append out
-                                                       "/include/mach/machine"))))))
+                             (let* ((out (assoc-ref outputs "out"))
+                                    (cpu "i386")
+                                    (machine (string-append
+                                              out "/include/mach/machine")))
+                               (unless (file-exists? machine)
+                                 (symlink cpu machine))))))
                        '()))))
 
    (inputs `(("static-bash" ,static-bash)))

M gnu/packages/cross-base.scm => gnu/packages/cross-base.scm +6 -5

@@ 747,11 747,12 @@ returned."
                                                " libmachuser.so libhurduser.so"))))))
                        (add-after 'install 'create-machine-symlink
                          (lambda* (#:key outputs #:allow-other-keys)
-                           (let ((out (assoc-ref outputs "out"))
-                                 (cpu "i386"))
-                             (symlink cpu
-                                      (string-append out
-                                                     "/include/mach/machine"))))))
+                           (let* ((out (assoc-ref outputs "out"))
+                                  (cpu "i386")
+                                  (machine (string-append
+                                            out "/include/mach/machine")))
+                             (unless (file-exists? machine)
+                               (symlink cpu machine))))))
                      '())))))
 
       ;; Shadow the native "kernel-headers" because glibc's recipe expects the