2 files changed, 35 insertions(+), 25 deletions(-)

M build-aux/build-self.scm
M guix/build/pull.scm

@@ 245,6 245,7 @@ Please upgrade to an intermediate version first, for instance with:
     (gexp->derivation "guix-latest" builder
                       #:modules '((guix build pull)
                                   (guix build utils)
+                                  (guix build compile)
 
                                   ;; Closure of (guix modules).
                                   (guix modules)

@@ 121,31 121,40 @@ containing the source code.  Write any debugging output to DEBUG-PORT."
 
     ;; Compile the .scm files.  Filter out files depending on Guile-SSH when
     ;; Guile-SSH is missing.
-    (let ((files (filter has-all-its-dependencies?
-                         (all-scheme-files out))))
-      (compile-files out out files
-
-                     #:workers (parallel-job-count)
-
-                     ;; Disable warnings.
-                     #:warning-options '()
-
-                     #:report-load
-                     (lambda (file total completed)
-                       (display #\cr log-port)
-                       (format log-port
-                               "loading...\t~5,1f% of ~d files" ;FIXME: i18n
-                               (* 100. (/ completed total)) total)
-                       (force-output log-port)
-                       (format debug-port "~%loading '~a'...~%" file))
-
-                     #:report-compilation
-                     (lambda (file total completed)
-                       (display #\cr log-port)
-                       (format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
-                               (* 100. (/ completed total)) total)
-                       (force-output log-port)
-                       (format debug-port "~%compiling '~a'...~%" file)))))
+    (with-directory-excursion out
+      (let ((files (filter has-all-its-dependencies?
+                           (all-scheme-files "."))))
+        (compile-files out out
+
+                       ;; XXX: 'compile-files' except ready-to-use relative
+                       ;; file names.
+                       (map (lambda (file)
+                              (if (string-prefix? "./" file)
+                                  (string-drop file 2)
+                                  file))
+                            files)
+
+                       #:workers (parallel-job-count)
+
+                       ;; Disable warnings.
+                       #:warning-options '()
+
+                       #:report-load
+                       (lambda (file total completed)
+                         (display #\cr log-port)
+                         (format log-port
+                                 "loading...\t~5,1f% of ~d files" ;FIXME: i18n
+                                 (* 100. (/ completed total)) total)
+                         (force-output log-port)
+                         (format debug-port "~%loading '~a'...~%" file))
+
+                       #:report-compilation
+                       (lambda (file total completed)
+                         (display #\cr log-port)
+                         (format log-port "compiling...\t~5,1f% of ~d files" ;FIXME: i18n
+                                 (* 100. (/ completed total)) total)
+                         (force-output log-port)
+                         (format debug-port "~%compiling '~a'...~%" file))))))
 
   (newline)
   #t)