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.
This commit is contained in:
Jan Nieuwenhuizen 2020-03-26 07:39:13 +01:00
parent fef7710937
commit 3342a1182b
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273

View file

@ -405,7 +405,8 @@ (define %binutils-static-stripped
(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 @@ (define %gcc-stripped
(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 @@ (define %bootstrap-tarballs
(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