janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 0782213d70b8eee909a8941efcd24b714c2247f6
Author: Jan Nieuwenhuizen <jann...@gnu.org>
Date:   Fri Jan 11 19:28:29 2019 +0100

    build-system/gnu: Support running configure with Gash.
    
    * guix/build/gnu-build-system.scm (configure): Support running with Gash.
---
 guix/build/gnu-build-system.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index e5f3197..97e686f 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<l...@gnu.org>
 ;;; Copyright © 2018 Mark H Weaver <m...@netris.org>
+;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <jann...@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -269,6 +270,8 @@ makefiles."
          (docdir     (assoc-ref outputs "doc"))
          (bash       (or (and=> (assoc-ref (or native-inputs inputs) "bash")
                                 (cut string-append <> "/bin/bash"))
+                         (and=> (assoc-ref (or native-inputs inputs) "gash")
+                                (cut string-append <> "/bin/gash"))
                          "/bin/sh"))
          (flags      `(,@(if target             ; cross building
                              '("CC_FOR_BUILD=gcc")

Reply via email to