From d3eeff8c0c553fd276f475590b2967bf388bdbed Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 11 May 2009 03:18:26 +0000
Subject: 	* boot/translator.boot: Don't load imported modules when 
 bootstrapping.

---
 src/boot/Makefile.in            | 4 ++--
 src/boot/strap/translator.clisp | 5 ++++-
 src/boot/translator.boot        | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 357874ae..53514bbe 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -148,7 +148,7 @@ stage1/bootsys$(EXEEXT): $(stage1_boot_objects)
 		 --output=$@ --load-directory=stage1 $(stage1_boot_objects)
 
 stage1/%.clisp: %.boot strap/stamp stage1/.started
-	strap/bootsys -- --translate --load-directory=stage1 --output=$@ $<
+	strap/bootsys -- --translate --import=skip --output=$@ $<
 
 
 ##
@@ -175,7 +175,7 @@ stage2/bootsys$(EXEEXT): $(stage2_boot_objects)
 		--output=$@ --load-directory=stage2 $(stage2_boot_objects)
 
 stage2/%.clisp: %.boot stage1/stamp stage2/.started
-	stage1/bootsys -- --translate --load-directory=stage2 --output=$@ $<
+	stage1/bootsys -- --translate --import=skip --output=$@ $<
 
 ##
 ## Generic rules for compiling FASLs
diff --git a/src/boot/strap/translator.clisp b/src/boot/strap/translator.clisp
index b809ddd6..cb67bdfb 100644
--- a/src/boot/strap/translator.clisp
+++ b/src/boot/strap/translator.clisp
@@ -659,7 +659,10 @@
              (|Import|
                  (LET ((|m| (CAR |bfVar#17|)))
                    (PROGN
-                     (|bootImport| (STRING |m|))
+                     (COND
+                       ((NOT (EQUAL (|getOptionValue| '|import|)
+                                    "skip"))
+                        (|bootImport| (STRING |m|))))
                      (LIST (LIST 'IMPORT-MODULE (STRING |m|))))))
              (|ImportSignature|
                  (LET ((|x| (CAR |bfVar#17|))
diff --git a/src/boot/translator.boot b/src/boot/translator.boot
index 083c374f..50574ee5 100644
--- a/src/boot/translator.boot
+++ b/src/boot/translator.boot
@@ -427,7 +427,8 @@ translateToplevel(b,export?) ==
         :[first translateToplevel(d,true) for d in ds]]
 
     Import(m) => 
-      bootImport STRING m
+      if getOptionValue "import" ^= '"skip" then
+        bootImport STRING m
       [["IMPORT-MODULE", STRING m]]
 
     ImportSignature(x, sig) =>
-- 
cgit v1.2.3