From 9cfc93be30c516fd6fa32915c61c06e03f23a011 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Fri, 3 Apr 2020 07:11:33 +0200
Subject: [PATCH] build-system/gnu: Allow overriding of bootstrap scripts.

* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Accept
bootstrap-scripts keyword argument and pass it to gnu-build.
(%bootstrap-scripts): New variable.
* guix/build/gnu-build-system.scm (%bootstrap-scripts): Remove variable.
(bootstrap): Remove default value for bootstrap-scripts argument.
---
 guix/build-system/gnu.scm       | 8 ++++++++
 guix/build/gnu-build-system.scm | 6 +-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index d6c4dc9bbc..2fed7736a1 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -324,10 +324,15 @@ standard packages used as implicit inputs of the GNU build system."
   ;; Regexp matching license files.
   "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$")
 
+(define %bootstrap-scripts
+  ;; Typical names of Autotools "bootstrap" scripts.
+  '("bootstrap" "bootstrap.sh" "autogen.sh"))
+
 (define* (gnu-build store name input-drvs
                     #:key (guile #f)
                     (outputs '("out"))
                     (search-paths '())
+                    (bootstrap-scripts %bootstrap-scripts)
                     (configure-flags ''())
                     (make-flags ''())
                     (out-of-source? #f)
@@ -401,6 +406,7 @@ packages that must not be referenced."
                                         search-paths)
                   #:phases ,phases
                   #:locale ,locale
+                  #:bootstrap-scripts ,bootstrap-scripts
                   #:configure-flags ,configure-flags
                   #:make-flags ,make-flags
                   #:out-of-source? ,out-of-source?
@@ -486,6 +492,7 @@ is one of `host' or `target'."
                           (search-paths '())
                           (native-search-paths '())
 
+                          (bootstrap-scripts %bootstrap-scripts)
                           (configure-flags ''())
                           (make-flags ''())
                           (out-of-source? #f)
@@ -570,6 +577,7 @@ platform."
                                              native-search-paths)
                     #:phases ,phases
                     #:locale ,locale
+                    #:bootstrap-scripts ,bootstrap-scripts
                     #:configure-flags ,configure-flags
                     #:make-flags ,make-flags
                     #:out-of-source? ,out-of-source?
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index f9e6f5013d..9480f08b72 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -160,11 +160,7 @@ working directory."
             (invoke "tar" "xvf" source))
         (chdir (first-subdirectory ".")))))
 
-(define %bootstrap-scripts
-  ;; Typical names of Autotools "bootstrap" scripts.
-  '("bootstrap" "bootstrap.sh" "autogen.sh"))
-
-(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts)
+(define* (bootstrap #:key bootstrap-scripts
                     #:allow-other-keys)
   "If the code uses Autotools and \"configure\" is missing, run
 \"autoreconf\".  Otherwise do nothing."