diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-11 03:18:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-11 03:18:26 +0000 |
| commit | d3eeff8c0c553fd276f475590b2967bf388bdbed (patch) | |
| tree | 9a10730cad5da6b9513bc67f3180aceb1105bed7 | |
| parent | c17f22c0fea71fba2e99aad1e7292be1963ae96d (diff) | |
| download | open-axiom-d3eeff8c0c553fd276f475590b2967bf388bdbed.tar.gz | |
* boot/translator.boot: Don't load imported modules when
bootstrapping.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/Makefile.in | 4 | ||||
| -rw-r--r-- | src/boot/strap/translator.clisp | 5 | ||||
| -rw-r--r-- | src/boot/translator.boot | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c170808..e4cb67f4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2009-05-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/translator.boot: Don't load imported modules when + bootstrapping. + +2009-05-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + Cope with SBCL-1.0.28 improvements. * boot/translator.boot (translateToplevel): Load imported modules. * boot/ast.boot ($constantIdentifiers): New. 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) => |