branch core-updates updated: profiles: 'profile-derivation' uses _IOLBF on Guile 2.0 only.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul 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 39569db  profiles: 'profile-derivation' uses _IOLBF on Guile 2.0 only.
39569db is described below

commit 39569dbb5f86c9c330e4b9700118e090f09d9548
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Mar 17 16:10:58 2020 +0100

    profiles: 'profile-derivation' uses _IOLBF on Guile 2.0 only.
    
    * guix/profiles.scm (profile-derivation)[builder]: Use _IOLBF on Guile
    2.0 only.
---
 guix/profiles.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 93ceafc..fbe34c8 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2016 Alex Kost <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
@@ -1511,8 +1511,10 @@ are cross-built for TARGET."
                          (guix search-paths)
                          (srfi srfi-1))
 
-            (setvbuf (current-output-port) _IOLBF)
-            (setvbuf (current-error-port) _IOLBF)
+            (let ((line (cond-expand (guile-2.2 'line)
+                                     (else _IOLBF)))) ;Guile 2.0
+              (setvbuf (current-output-port) line)
+              (setvbuf (current-error-port) line))
 
             #+(if locales? set-utf8-locale #t)