From 457ded48c54ba04489cb871d3ec6bda0c59bead7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Fri, 17 Apr 2020 12:32:44 +0200 Subject: gnu: git: Fix for cross-compiling to the Hurd. * 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 88a25f04f1..7fc0244bc9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -253,9 +253,17 @@ (define-public git ,@%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") #\:)) -- cgit v1.2.3