--- a/Makefile Tue Jan 14 20:13:31 2020 -0500
+++ b/Makefile Fri Feb 28 13:33:54 2020 -0500
@@ -21,7 +21,7 @@
ccl --load "src/build-binary.lisp"
cp bin/cacl-ccl build/
-build/cacl-ecl: build $(lisps) bin/cacl-ecl
+build/cacl-ecl: build $(lisps)
cp bin/cacl-ecl build/
build/cacl-abcl: build $(lisps) bin/cacl-abcl
--- a/cacl.asd Tue Jan 14 20:13:31 2020 -0500
+++ b/cacl.asd Fri Feb 28 13:33:54 2020 -0500
@@ -11,6 +11,7 @@
:flexi-streams
:iterate
:str
+ :uiop
:yason)
:serial t
--- a/src/base.lisp Tue Jan 14 20:13:31 2020 -0500
+++ b/src/base.lisp Fri Feb 28 13:33:54 2020 -0500
@@ -419,7 +419,7 @@
:long "rcfile"
:parameter "PATH"
:initial-value "~/.caclrc"
- :reduce #'adopt:newest))
+ :reduce #'adopt:last))
(defparameter *o-no-rcfile*
(adopt:make-option 'no-rcfile
--- a/src/build-binary.lisp Tue Jan 14 20:13:31 2020 -0500
+++ b/src/build-binary.lisp Fri Feb 28 13:33:54 2020 -0500
@@ -1,4 +1,6 @@
-(ql:quickload :cacl)
+(require :asdf)
+(require :uiop)
+(asdf:load-system :cacl)
;; Run these generic functions once now so their bodies will get compiled at
;; build time, instead of delaying it until the first time the user runs
@@ -26,3 +28,9 @@
"build/cacl-ccl.image"
:toplevel-function #'cacl:toplevel
:purify t))
+
+#+ecl
+(asdf:make-build :cacl
+ :type :program
+ :move-here #P"./"
+ :epilogue-code '(cacl:toplevel))