1.0.28.34: convert once-used DEFMACROs to EVAL-WHEN'd SB!XC:DEFMACROs

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

diff --git a/src/cold/warm.lisp b/src/cold/warm.lisp
index 4f0b476..37149cf 100644 (file)
--- a/src/cold/warm.lisp
+++ b/src/cold/warm.lisp
@@ -65,21 +65,6 @@
 \f
 ;;;; compiling and loading more of the system
 
-(let* ((sys *default-pathname-defaults*)
-       (src
-        (merge-pathnames
-         (make-pathname :directory '(:relative "src" :wild-inferiors)
-                        :name :wild :type :wild)
-         sys))
-       (contrib
-        (merge-pathnames
-         (make-pathname :directory '(:relative "contrib" :wild-inferiors)
-                        :name :wild :type :wild)
-         sys)))
-  (setf (logical-pathname-translations "SYS")
-        `(("SYS:SRC;**;*.*.*" ,src)
-          ("SYS:CONTRIB;**;*.*.*" ,contrib))))
-
 ;;; FIXME: CMU CL's pclcom.lisp had extra optional stuff wrapped around
 ;;; COMPILE-PCL, at least some of which we should probably have too:
 ;;;
@@ -125,9 +110,9 @@
                 "SRC;PCL;DEFCLASS"
                 "SRC;PCL;DEFS"
                 "SRC;PCL;FNGEN"
+                "SRC;PCL;WRAPPER"
                 "SRC;PCL;CACHE"
                 "SRC;PCL;DLISP"
-                "SRC;PCL;DLISP2"
                 "SRC;PCL;BOOT"
                 "SRC;PCL;VECTOR"
                 "SRC;PCL;SLOTS-BOOT"
@@ -193,7 +178,9 @@
       (tagbody
        retry-compile-file
          (multiple-value-bind (output-truename warnings-p failure-p)
-             (compile-file fullname)
+             (if *compile-files-p*
+                 (compile-file fullname)
+                 (compile-file-pathname fullname))
            (declare (ignore warnings-p))
            (sb-int:/show "done compiling" fullname)
            (cond ((not output-truename)