summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-03-17 16:10:58 +0100
committerLudovic Courtès <ludo@gnu.org>2020-03-17 16:10:58 +0100
commit39569dbb5f86c9c330e4b9700118e090f09d9548 (patch)
tree384530af481d318a9c3726fc8a41d17b713cc105 /guix
parentb03753d8ccf73777d2bbbe65441da6bb6dfa7e8f (diff)
downloadpatches-39569dbb5f86c9c330e4b9700118e090f09d9548.tar
patches-39569dbb5f86c9c330e4b9700118e090f09d9548.tar.gz
profiles: 'profile-derivation' uses _IOLBF on Guile 2.0 only.
* guix/profiles.scm (profile-derivation)[builder]: Use _IOLBF on Guile 2.0 only.
Diffstat (limited to 'guix')
-rw-r--r--guix/profiles.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 93ceafc4bc..fbe34c8455 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 <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@@ -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)