me/guix
Archived
1
0
Fork 0
Code Activity

gnu: make-bootstrap: Use _IOLBF on Guile 2.0 only.

Browse source 
* 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
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/packages/make-bootstrap.scm
View file

@ -405,7 +405,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(begin (begin
(use-modules (guix build utils)) (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")) (let* ((in (assoc-ref %build-inputs "binutils"))
(out (assoc-ref %outputs "out")) (out (assoc-ref %outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
@ -545,7 +546,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(srfi srfi-26) (srfi srfi-26)
(guix build utils)) (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")) (let* ((out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin")) (bindir (string-append out "/bin"))
(libdir (string-append out "/lib")) (libdir (string-append out "/lib"))
@ -869,7 +871,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(ice-9 match) (ice-9 match)
(srfi srfi-26)) (srfi srfi-26))
(setvbuf (current-output-port) _IOLBF) (setvbuf (current-output-port)
(cond-expand (guile-2.0 _IOLBF) (else 'line)))
(mkdir out) (mkdir out)
(chdir out) (chdir out)
(for-each (match-lambda (for-each (match-lambda