diff options
| -rw-r--r-- | guix/build-system/gnu.scm | 10 | ||||
| -rw-r--r-- | guix/build/gnu-build-system.scm | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index a1b2b654aa..c74acb51b0 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -328,7 +328,7 @@ standard packages used as implicit inputs of the GNU build system." (define %bootstrap-scripts ;; Typical names of Autotools "bootstrap" scripts. - '("bootstrap" "bootstrap.sh" "autogen.sh")) + #~%bootstrap-scripts) (define %strip-flags #~'("--strip-unneeded" "--enable-deterministic-archives")) @@ -341,7 +341,7 @@ standard packages used as implicit inputs of the GNU build system." guile source (outputs '("out")) (search-paths '()) - (bootstrap-scripts (list 'quote %bootstrap-scripts)) + (bootstrap-scripts %bootstrap-scripts) (configure-flags ''()) (make-flags ''()) (out-of-source? #f) @@ -400,7 +400,7 @@ are allowed to refer to." (sexp->gexp phases) phases) #:locale #$locale - #:bootstrap-scripts #$(sexp->gexp bootstrap-scripts) + #:bootstrap-scripts #$bootstrap-scripts #:configure-flags #$(if (pair? configure-flags) (sexp->gexp configure-flags) configure-flags) @@ -474,7 +474,7 @@ is one of `host' or `target'." (search-paths '()) (native-search-paths '()) - (bootstrap-scripts (list 'quote %bootstrap-scripts)) + (bootstrap-scripts %bootstrap-scripts) (configure-flags ''()) (make-flags ''()) (out-of-source? #f) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index af64b3b61f..28c719d9ca 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -36,6 +36,7 @@ #:use-module (rnrs io ports) #:export (%standard-phases %license-file-regexp + %bootstrap-scripts dump-file-contents gnu-build)) @@ -176,7 +177,11 @@ working directory." ;; Attempt to change into child directory. (and=> (first-subdirectory ".") chdir)))) -(define* (bootstrap #:key bootstrap-scripts +(define %bootstrap-scripts + ;; Typical names of Autotools "bootstrap" scripts. + '("bootstrap" "bootstrap.sh" "autogen.sh")) + +(define* (bootstrap #:key (bootstrap-scripts %bootstrap-scripts) #:allow-other-keys) "If the code uses Autotools and \"configure\" is missing, run \"autoreconf\". Otherwise do nothing." |