Complete previous refactoring to make it functional on MKCL.

diff --git a/bundle.lisp b/bundle.lisp
index 990a51b..d5efa5d 100644 (file)
--- a/bundle.lisp
+++ b/bundle.lisp
@@ -58,6 +58,7 @@
 
 #+ecl (monolithic :initform nil :reader bundle-op-monolithic-p)
 
+#+ecl
 (defmethod initialize-instance :after ((instance bundle-op) &rest initargs
                                        &key (name-suffix nil name-suffix-p)
                                        &allow-other-keys)
@@ -181,6 +182,7 @@
   (declare (ignorable o c))
   nil)
 
+#-mkcl
 (defmethod input-files ((o bundle-op) (c system))
   (loop :for (sub-op . sub-c) :in (bundle-sub-operations o c)
         :nconc (output-files sub-op sub-c)))

diff --git a/mkcl.lisp b/mkcl.lisp
index da664b4..60fc1b1 100644 (file)
--- a/mkcl.lisp
+++ b/mkcl.lisp
@@ -20,9 +20,9 @@
                     :filter-system sys
                     :filter-type '(not system)))
 
-(defun files-to-bundle (sys &aux files)
+(defun files-to-bundle (sys)
   (loop :for (op . comp) :in (mkcl-bundle-sub-operations sys)
-    :for files = (output-files op comp)
+    :for sub-files = (output-files op comp)
     :when sub-files
     :collect (first sub-files)))
 
@@ -75,4 +75,6 @@
   (declare (ignore o))
   nil)
 
-(pushnew '("fasb" . si::load-binary) ext:*load-hooks* :test 'equal :key 'car)
+;; The ability to load a fasb bundle is separate from
+;; the ability to build a fasb bundle, so this is somewhat unrelated to what is above.
+(pushnew '("fasb" . si::load-binary) si:*load-hooks* :test 'equal :key 'car)