From 14d409b55124b2cb94a38e7cd4624fdb5710fa94 Mon Sep 17 00:00:00 2001
From: ram <ram>
Date: Thu, 22 Feb 1990 09:57:05 +0000
Subject: [PATCH] Moved *new-compile* compilation of macros from the end to the
 same place where they were done in the bootstrap environment (so that new
 macros take effect in the compilation.)

---
 tools/comcom.lisp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tools/comcom.lisp b/tools/comcom.lisp
index f6b8675cd..138af4060 100644
--- a/tools/comcom.lisp
+++ b/tools/comcom.lisp
@@ -56,8 +56,7 @@
 (comf "c:rt/parms")
 (comf "c:vop" :always-once *new-compile*)
 
-(unless *new-compile*
-  (comf "c:vmdef" :load t :bootstrap-macros :both))
+(comf "c:vmdef" :load t :bootstrap-macros :both)
 
 (comf "c:tn" :bootstrap-macros :both)
 (comf "c:bit-util")
@@ -73,8 +72,14 @@
       :bootstrap-macros :both
       :always-once *new-compile*)
 
-(unless *new-compile*
-  (comf "c:rt/assem-insts" :load t))
+(comf "c:rt/assem-insts" :load t)
+
+(when *new-compile*
+  (comf "c:eval-comp")
+  (comf "c:eval" :bootstrap-macros :both)
+  (let ((c:*compile-time-define-macros* nil))
+    (comf "c:macros" :load t)))
+
 
 (comf "c:aliencomp")
 (comf "c:debug-dump")
@@ -85,8 +90,7 @@
   (comf "assem:assembler")
   (comf "c:fop"))
 
-(unless *new-compile*
-  (comf "c:rt/assem-macs" :load t :bootstrap-macros :both))
+(comf "c:rt/assem-macs" :load t :bootstrap-macros :both)
 
 (comf "c:rt/dump")
 
@@ -142,13 +146,5 @@
   (comf "c:globaldb" :output-file "c:boot-globaldb.fasl"
 	:bootstrap-macros :both))
 
-(when *new-compile*
-  (comf "c:eval-comp")
-  (comf "c:eval" :bootstrap-macros :both)
-  (let ((c:*compile-time-define-macros* nil))
-    (comf "c:rt/assem-insts")
-    (comf "c:rt/assem-macs")
-    (comf "c:vmdef")
-    (comf "c:macros")))
 
 ); with-compiler-error-log
-- 
GitLab