Commit 5a983a31 authored by ehuelsmann@1c010e3e-69d0-11dd-93a8-456734b0d56f's avatar ehuelsmann@1c010e3e-69d0-11dd-93a8-456734b0d56f
Browse files

Fix the incremental build.

parent d83b0937
...@@ -257,13 +257,13 @@ ...@@ -257,13 +257,13 @@
(*prevent-fasl-circle-detection* t)) (*prevent-fasl-circle-detection* t))
(unless output-path (unless output-path
(setf output-path *default-pathname-defaults*)) (setf output-path *default-pathname-defaults*))
(flet ((do-compile (file) (flet ((do-compile (file &key (extract t))
(let ((out (make-pathname :type *compile-file-type* (let ((out (make-pathname :type *compile-file-type*
:defaults (merge-pathnames :defaults (merge-pathnames
file output-path)))) file output-path))))
(compile-file-if-needed file (compile-file-if-needed file
:output-file out :output-file out
:extract-toplevel-funcs-and-macros t)))) :extract-toplevel-funcs-and-macros extract))))
(load (do-compile "defstruct.lisp")) (load (do-compile "defstruct.lisp"))
(load (do-compile "coerce.lisp")) (load (do-compile "coerce.lisp"))
(load (do-compile "open.lisp")) (load (do-compile "open.lisp"))
...@@ -452,8 +452,10 @@ ...@@ -452,8 +452,10 @@
(generate-autoloads output-path) (generate-autoloads output-path)
;; Compile the file in the build directory instead of the one in the ;; Compile the file in the build directory instead of the one in the
;; sources directory - the latter being for bootstrapping only. ;; sources directory - the latter being for bootstrapping only.
(do-compile (merge-pathnames #p"autoloads-gen.lisp" output-path)) (do-compile (merge-pathnames #p"autoloads-gen.lisp" output-path)
(do-compile "autoloads.lisp")) :extract nil)
(do-compile "autoloads.lisp"
:extract nil))
t)) t))
(defun compile-system (&key quit (zip t) (cls-ext *compile-file-class-extension*) (abcl-ext *compile-file-type*) output-path) (defun compile-system (&key quit (zip t) (cls-ext *compile-file-class-extension*) (abcl-ext *compile-file-type*) output-path)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment