Make fasl-type a function, not a special variable. Should make ECL happier.

diff --git a/bundle.lisp b/bundle.lisp
index 6857141..5b149f4 100644 (file)
--- a/bundle.lisp
+++ b/bundle.lisp
@@ -18,8 +18,10 @@
 ;;; The different targets are defined by specialization.
 ;;;
 
-(defparameter *fasl-type* (pathname-type (compile-file-pathname "foo.lisp"))
-  "pathname TYPE for lisp FASt Loading files")
+(defun fasl-type ()
+  "pathname TYPE for lisp FASt Loading files"
+  (#-ecl load-time-value #+ecl identity
+   (pathname-type (compile-file-pathname "foo.lisp"))))
 
 (defclass bundle-op (operation)
   ((build-args :initarg :args :initform nil :accessor bundle-op-build-args)
@@ -292,7 +294,7 @@
   (coerce-pathname
    (or (slot-value component 'relative-pathname)
        (component-name component))
-   :type *fasl-type*
+   :type (fasl-type)
    :defaults (component-parent-pathname component)))
 
 (defmethod output-files (o (c compiled-file))

diff --git a/fasl-concat.lisp b/fasl-concat.lisp
index 612730e..c820e14 100644 (file)
--- a/fasl-concat.lisp
+++ b/fasl-concat.lisp
@@ -49,8 +49,8 @@ For the latter case, we ought pick random suffix and atomically open it."
 
 (defmethod perform ((o bundle-op) (c system))
   (let* ((input-files (input-files o c))
-         (fasl-files (remove *fasl-type* input-files :key #'pathname-type :test-not #'string=))
-         (non-fasl-files (remove *fasl-type* input-files :key #'pathname-type :test #'string=))
+         (fasl-files (remove (fasl-type) input-files :key #'pathname-type :test-not #'string=))
+         (non-fasl-files (remove (fasl-type) input-files :key #'pathname-type :test #'string=))
          (output-files (output-files o c))
          (output-file (first output-files)))
     (when input-files

diff --git a/specials.lisp b/specials.lisp
index c3e30fc..d624a33 100644 (file)
--- a/specials.lisp
+++ b/specials.lisp
@@ -3,6 +3,3 @@
 #+xcvb (module ())
 
 (in-package :asdf)
-
-(defparameter *fasl-type* (pathname-type (compile-file-pathname "foo.lisp"))
-  "pathname TYPE for lisp FASt Loading files")