aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-06-16 14:25:41 +0200
committerLudovic Courtès <ludo@gnu.org>2021-06-18 14:18:06 +0200
commit003728cfab907be5df1411c5faaf466a2b8d5ba2 (patch)
tree8f9448cdb3195ff9e97d9a0df27485f0bbedc2f2
parentf371972e788df6310e12d15914d70d834c9deadb (diff)
downloadguix-003728cfab907be5df1411c5faaf466a2b8d5ba2.tar
guix-003728cfab907be5df1411c5faaf466a2b8d5ba2.tar.gz
build: Remove Guile 2.2 workaround.
* build-aux/compile-all.scm <top level>: Remove Guile 2.2 workaround.
-rw-r--r--build-aux/compile-all.scm9
1 files changed, 3 insertions, 6 deletions
diff --git a/build-aux/compile-all.scm b/build-aux/compile-all.scm
index ad75e33a85..e6982f50fb 100644
--- a/build-aux/compile-all.scm
+++ b/build-aux/compile-all.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -132,11 +132,8 @@ to 'make'."
(false-if-exception
(module-ref ui 'report-load-error)))))
(if report
- ;; In Guile <= 2.2.5, 'current-load-port' was not exported.
- (let ((load-port ((module-ref (resolve-module '(ice-9 ports))
- 'current-load-port))))
- (report (or (and=> load-port port-filename) "?.scm")
- args frame))
+ (report (or (and=> (current-load-port) port-filename) "?.scm")
+ args frame)
(begin
(print-exception (current-error-port) frame
(car args) (cdr args))