guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: guix: Fix cross-compilation.


From: guix-commits
Subject: branch master updated: gnu: guix: Fix cross-compilation.
Date: Fri, 29 Sep 2023 05:43:58 -0400

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new c4886c0cb6 gnu: guix: Fix cross-compilation.
c4886c0cb6 is described below

commit c4886c0cb608e1b36969f195eb2f7ea25a37ac89
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 29 11:41:20 2023 +0200

    gnu: guix: Fix cross-compilation.
    
    Fixes a regression introduced in
    59587e2fda76c19b424fda9a987ff90d52ef217e where ./configure would fail
    when cross-compiling with “Git is missing”.
    
    Reported by gabber on #guix.
    
    * gnu/packages/package-management.scm (guix)[arguments]: Add
    ‘ac_cv_path_GIT’ to #:configure-flags.
---
 gnu/packages/package-management.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 044da9290c..de987b1b7f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -215,6 +215,13 @@
                             ;; system installation image.)
                             "ac_cv_path_DOT_USER_PROGRAM=dot"
 
+                            ;; When cross-compiling, 'git' is not in $PATH
+                            ;; (because it's not a native input).  Thus,
+                            ;; always explicitly pass its file name.
+                            (string-append "ac_cv_path_GIT="
+                                           (search-input-file %build-inputs
+                                                              "/bin/git"))
+
                             ;; To avoid problems with the length of shebangs,
                             ;; choose a fixed-width and short directory name
                             ;; for tests.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]