[bug#78538] guix: gnu-dist: Fix distcheck.

Message ID 1286006b2579e96659f14e0a0df8ca3ab89bdecb.1747835660.git.efraim@flashner.co.il
State New
Headers
Series [bug#78538] guix: gnu-dist: Fix distcheck. |

Commit Message

Efraim Flashner May 21, 2025, 3:49 p.m. UTC
  * guix/build/gnu-dist.scm (build): Add a configure-flag during the
distcheck rebuild to use a shell we have in the build environment.

Change-Id: I3519ab498ef47728729297a70ac1dce8e1b922ee
---
 guix/build/gnu-dist.scm | 3 +++
 1 file changed, 3 insertions(+)


base-commit: 11bc17c409d77cd1af91e30b5b9f6a73f873a152
  

Patch

diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm
index cc48d3bdbff..59ac0012b80 100644
--- a/guix/build/gnu-dist.scm
+++ b/guix/build/gnu-dist.scm
@@ -1,6 +1,7 @@ 
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015, 2020, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,6 +38,8 @@  (define* (build #:key build-before-dist? make-flags (dist-target "distcheck")
     (let ((build (assq-ref %standard-phases 'build)))
       (apply build args)))
   (format #t "building target `~a'~%" dist-target)
+  (setenv "DISTCHECK_CONFIGURE_FLAGS"
+          (string-append "SHELL=" (which "sh")))
   (apply invoke "make" dist-target make-flags))
 
 (define* (install-dist #:key outputs #:allow-other-keys)