X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fwarm.lisp;h=838b4d2662d0a38ed83b0be9111557402c2356c1;hb=da2e2f4be772532cacd9188d206d4eb82dc9f6ef;hp=0015e82b0d5534acbfbc7ebcb8a3d27308961358;hpb=df679ed627975948b1cee190f4d79c397588c43e;p=sbcl.git

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 0015e82..838b4d2 100644
--- 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))))))
 
 ;;;; setting package documentation