aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/ui.scm17
1 files changed, 10 insertions, 7 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index fb2380b68a..221bb82b7e 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -52,6 +52,7 @@
#:use-module (ice-9 match)
#:use-module (ice-9 format)
#:use-module (ice-9 regex)
+ #:autoload (system base compile) (compile-file)
#:autoload (system repl repl) (start-repl)
#:autoload (system repl debug) (make-debug stack->vector)
#:use-module (texinfo)
@@ -186,8 +187,8 @@ messages."
(define (error-string frame args)
(call-with-output-string
- (lambda (port)
- (apply display-error frame port (cdr args)))))
+ (lambda (port)
+ (apply display-error frame port (cdr args)))))
(define tag
(make-prompt-tag "user-code"))
@@ -199,11 +200,13 @@ messages."
;; In 2.2.3, the bogus answer to <https://bugs.gnu.org/29226> was to
;; ignore all available .go, not just those from ~/.cache, which in turn
;; meant that we had to rebuild *everything*. Since this is too costly,
- ;; we have to turn auto '%fresh-auto-compile' with that version, at the
- ;; risk of getting ABI breakage in the user's config file. See
- ;; <https://bugs.gnu.org/29881>.
- (unless (string=? (version) "2.2.3")
- (set! %fresh-auto-compile #t))
+ ;; we have to turn off '%fresh-auto-compile' with that version, so to
+ ;; avoid ABI breakage in the user's config file, we explicitly compile
+ ;; it (the problem remains if the user's config is spread on several
+ ;; modules.) See <https://bugs.gnu.org/29881>.
+ (if (string=? (version) "2.2.3")
+ (compile-file file #:env user-module)
+ (set! %fresh-auto-compile #t))
(set! %load-should-auto-compile #t)