* lisp/core.lisp.in (|%basicSystemIsComplete|): New. Export.

	(|link|): Use prologue for all systems.
	* interp/sys-driver.boot (systemMain): New.  Break from restart().
	(restart): Tidy.
	* interp/boot-pkg.lisp: Don't push :OPEN-AXIOM-BOOT-COMPLETE.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index 27f0dd41..bfa3aad9 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -68,6 +68,7 @@
            "%hasFeature"
 	   "%systemOptions"
 	   "%systemArguments"
+	   "%basicSystemIsComplete"
 	   
 	   "$hostPlatform"
 	   "$buildPlatform"
@@ -132,6 +133,9 @@
 (defun boot-completed-p nil
   (member :open-axiom-boot *features*))
 
+(defun |%basicSystemIsComplete| nil
+  (member :open-axiom-basic-system *features*))
+
 ;; 
 ;; -*- Hosting Lisp System -*-
 ;;
@@ -570,11 +574,11 @@
 ;; this point.  You have been warned.
 (defun |link| (core-image lisp-files 
 			  &optional (entry-point nil) (prologue nil))
-  #-:ecl (declare (ignore prologue))
   (if (and entry-point (stringp entry-point))
       (setq entry-point `(read-from-string ,entry-point)))
   #-:ecl (progn
            (mapcar #'(lambda (p) (|loadOrElse| p)) lisp-files)
+	   (eval prologue)
            (|saveCore| core-image entry-point))
   #+:ecl (progn
            (unless entry-point