[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates updated: gnu: make-bootstrap: Use _IOLBF on Guile 2.
From: |
guix-commits |
Subject: |
branch core-updates updated: gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only. |
Date: |
Thu, 26 Mar 2020 02:52:39 -0400 |
This is an automated email from the git hooks/post-receive script.
janneke pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 3342a11 gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only.
3342a11 is described below
commit 3342a1182b15ec031f0ec6f602fd96c1dca3d4b0
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Thu Mar 26 07:39:13 2020 +0100
gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only.
* gnu/packages/make-bootstrap.scm (%binutils-static-stripped, %gcc-stripped,
%bootstrap-tarballs)[arguments]: Wrap use of '_IOLBF' in 'cond-expand' and
use
'line instead on Guile > 2.0.
---
gnu/packages/make-bootstrap.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index f8d782f..b3610af 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -405,7 +405,8 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(begin
(use-modules (guix build utils))
- (setvbuf (current-output-port) _IOLBF)
+ (setvbuf (current-output-port)
+ (cond-expand (guile-2.0 _IOLBF) (else 'line)))
(let* ((in (assoc-ref %build-inputs "binutils"))
(out (assoc-ref %outputs "out"))
(bin (string-append out "/bin")))
@@ -545,7 +546,8 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(srfi srfi-26)
(guix build utils))
- (setvbuf (current-output-port) _IOLBF)
+ (setvbuf (current-output-port)
+ (cond-expand (guile-2.0 _IOLBF) (else 'line)))
(let* ((out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin"))
(libdir (string-append out "/lib"))
@@ -869,7 +871,8 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(ice-9 match)
(srfi srfi-26))
- (setvbuf (current-output-port) _IOLBF)
+ (setvbuf (current-output-port)
+ (cond-expand (guile-2.0 _IOLBF) (else 'line)))
(mkdir out)
(chdir out)
(for-each (match-lambda
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates updated: gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only.,
guix-commits <=