guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: bootstrap-tarballs: Fix build.


From: guix-commits
Subject: 01/02: gnu: bootstrap-tarballs: Fix build.
Date: Mon, 5 Jul 2021 17:59:16 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 8740a62b6be3016a9dd0c61912152c69bdd4eb41
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jul 5 22:18:23 2021 +0200

    gnu: bootstrap-tarballs: Fix build.
    
    * gnu/packages/make-bootstrap.scm (%bootstrap-tarballs)[arguments]: Make
    'use-modules' the first expression.  Failing that, 'match' would not be
    properly expanded when running on Guile 3.0.
---
 gnu/packages/make-bootstrap.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2cf7881..196faad 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.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 © 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
@@ -880,11 +880,13 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
     (arguments
      `(#:modules ((guix build utils))
        #:builder
-       (let ((out (assoc-ref %outputs "out")))
+       (begin
          (use-modules (guix build utils)
                       (ice-9 match)
                       (srfi srfi-26))
 
+         (define out (assoc-ref %outputs "out"))
+
          (setvbuf (current-output-port)
                   (cond-expand (guile-2.0 _IOLBF) (else 'line)))
          (mkdir out)



reply via email to

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