Don't save boot inits if there are none.

This exposed some packages with inits that weren't doing anything.

diff --git a/src/runtime/boot.scm b/src/runtime/boot.scm
index 36fcd08e137237a2c4a2853290ff1caed5738f3a..68cd9428a6161bb35983f05dbe50b24eaba992ea 100644 (file)
--- a/src/runtime/boot.scm
+++ b/src/runtime/boot.scm
@@ -154,16 +154,17 @@ USA.
   unspecific)
 
 (define (save-boot-inits! environment)
-  (let ((inits (reverse! boot-inits)))
-    (set! boot-inits #f)
-    (let ((p (assq environment saved-boot-inits)))
-      (if p
-         (set-cdr! p (append! (cdr p) inits))
-         (begin
-           (set! saved-boot-inits
-                 (cons (cons environment inits)
-                       saved-boot-inits))
-           unspecific)))))
+  (if (pair? boot-inits)
+      (let ((inits (reverse! boot-inits)))
+       (set! boot-inits #f)
+       (let ((p (assq environment saved-boot-inits)))
+         (if p
+             (set-cdr! p (append! (cdr p) inits))
+             (begin
+               (set! saved-boot-inits
+                     (cons (cons environment inits)
+                           saved-boot-inits))
+               unspecific))))))
 
 (define (get-boot-init-runner environment)
   (let ((p (assq environment saved-boot-inits)))

diff --git a/src/runtime/make.scm b/src/runtime/make.scm
index 482b610c80fafb9b35b27b9b3dd7e6dd389f9bc0..f8a6232bd25b601d13f5230fb0373c14e871bdae 100644 (file)
--- a/src/runtime/make.scm
+++ b/src/runtime/make.scm
@@ -482,7 +482,6 @@ USA.
    ;; Microcode data structures
    (RUNTIME HISTORY)
    (RUNTIME SCODE)
-   (RUNTIME SCODE-COMBINATOR)
    (RUNTIME SCODE-WALKER)
    (RUNTIME CONTINUATION-PARSER)
    (RUNTIME PROGRAM-COPIER)
@@ -516,7 +515,6 @@ USA.
    (RUNTIME FILE-I/O-PORT)
    (RUNTIME CONSOLE-I/O-PORT)
    (RUNTIME SOCKET)
-   (RUNTIME TRANSCRIPT)
    (RUNTIME STRING-I/O-PORT)
    (RUNTIME USER-INTERFACE)
    ;; These MUST be done before (RUNTIME PATHNAME)
@@ -530,7 +528,6 @@ USA.
    (RUNTIME SIMPLE-FILE-OPS)
    (OPTIONAL (RUNTIME OS-PRIMITIVES) INITIALIZE-MIME-TYPES!)
    ;; Syntax
-   (RUNTIME KEYWORD)
    (RUNTIME NUMBER-PARSER)
    (RUNTIME OPTIONS)
    (RUNTIME PARSER)
@@ -570,7 +567,6 @@ USA.
    (RUNTIME URI)
    (RUNTIME RFC2822-HEADERS)
    (RUNTIME HTTP-SYNTAX)
-   (RUNTIME HTTP-CLIENT)
    (RUNTIME HTML-FORM-CODEC)
    (OPTIONAL (RUNTIME WIN32-REGISTRY))
    (OPTIONAL (RUNTIME FFI))