From 003728cfab907be5df1411c5faaf466a2b8d5ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Jun 2021 14:25:41 +0200 Subject: [PATCH] build: Remove Guile 2.2 workaround. * build-aux/compile-all.scm : Remove Guile 2.2 workaround. --- build-aux/compile-all.scm | 9 +++------ 1 file 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 -;;; Copyright © 2016, 2017, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -132,11 +132,8 @@ (define (% completed total) (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))