gnu: git: Fix for cross-compiling to the Hurd.
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>
Fri, 17 Apr 2020 10:32:44 +0000 (12:32 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Sun, 19 Apr 2020 14:18:01 +0000 (16:18 +0200)
* gnu/packages/version-control.scm (git)[arguments]: When cross-compiling, fix
`config.mak.uname' kludge to use the host system configuration.

gnu/packages/version-control.scm

index 88a25f0..7fc0244 100644 (file)
@@ -253,9 +253,17 @@ as well as the classic centralized workflow.")
                  ,@%gnu-build-system-modules)
       #:phases
       (modify-phases %standard-phases
-        ;; We do not have bash-for-tests when cross-compiling.
         ,@(if (%current-target-system)
-              '()
+              ;; The git build system assumes build == host
+              `((add-after 'unpack  'use-host-uname_S
+                  (lambda _
+                    (substitute* "config.mak.uname"
+                      (("uname_S := .*" all)
+                       (if (equal? ,(%current-target-system) "i586-pc-gnu")
+                         "uname_S := GNU\n"
+                         all)))
+                    #t)))
+              ;; We do not have bash-for-tests when cross-compiling.
               `((add-after 'unpack 'modify-PATH
                   (lambda* (#:key inputs #:allow-other-keys)
                     (let ((path (string-split (getenv "PATH") #\:))