mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
build: Remove Guile 2.2 workaround.
* build-aux/compile-all.scm <top level>: Remove Guile 2.2 workaround.
This commit is contained in:
parent
f371972e78
commit
003728cfab
1 changed files with 3 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
;;; 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.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -132,11 +132,8 @@ (define (% completed total)
|
||||||
(false-if-exception
|
(false-if-exception
|
||||||
(module-ref ui 'report-load-error)))))
|
(module-ref ui 'report-load-error)))))
|
||||||
(if report
|
(if report
|
||||||
;; In Guile <= 2.2.5, 'current-load-port' was not exported.
|
(report (or (and=> (current-load-port) port-filename) "?.scm")
|
||||||
(let ((load-port ((module-ref (resolve-module '(ice-9 ports))
|
args frame)
|
||||||
'current-load-port))))
|
|
||||||
(report (or (and=> load-port port-filename) "?.scm")
|
|
||||||
args frame))
|
|
||||||
(begin
|
(begin
|
||||||
(print-exception (current-error-port) frame
|
(print-exception (current-error-port) frame
|
||||||
(car args) (cdr args))
|
(car args) (cdr args))
|
||||||
|
|
Loading…
Reference in a new issue