0.8.1.46:

[sbcl.git] / src / cold / warm.lisp

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 0015e82..838b4d2 100644 (file)
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -136,6 +136,7 @@
 
                ;; miscellaneous functionality which depends on CLOS
                "src/code/force-delayed-defbangmethods"
+                "src/code/late-condition"
 
                ;; CLOS-level support for the Gray OO streams
                ;; extension (which is also supported by various
@@ -163,9 +164,11 @@
   (let ((fullname (concatenate 'string stem ".lisp")))
     (sb-int:/show "about to compile" fullname)
     (flet ((report-recompile-restart (stream)
-             (format stream "Recompile file ~S" src))
+             (format stream "Recompile file ~S" fullname))
            (report-continue-restart (stream)
-             (format stream "Continue, using possibly bogus file ~S" obj)))
+             (format stream
+                    "Continue, using possibly bogus file ~S"
+                    (compile-file-pathname fullname))))
       (tagbody
        retry-compile-file
          (multiple-value-bind (output-truename warnings-p failure-p)
@@ -173,12 +176,12 @@
            (declare (ignore warnings-p))
           (sb-int:/show "done compiling" fullname)
            (cond ((not output-truename)
-                  (error "COMPILE-FILE of ~S failed." src))
+                  (error "COMPILE-FILE of ~S failed." fullname))
                  (failure-p
                  (unwind-protect
                       (restart-case
                           (error "FAILURE-P was set when creating ~S."
-                                 obj)
+                                 output-truename)
                         (recompile ()
                           :report report-recompile-restart
                           (go retry-compile-file))
@@ -193,7 +196,7 @@
                  (t nil))
           (unless (load output-truename)
             (error "LOAD of ~S failed." output-truename))
-          (sb-int:/show "done loading" compiled-truename))))))
+          (sb-int:/show "done loading" output-truename))))))
 \f
 ;;;; setting package documentation