diff --git a/bin/build-utils.sh b/bin/build-utils.sh index 18d6f60e27a1c2cd1ef45f4fed73d556721cda2b..5f7671f8049b26c27393d2b1a193a08c57dbf5cd 100755 --- a/bin/build-utils.sh +++ b/bin/build-utils.sh @@ -16,7 +16,7 @@ TARGET="`echo $1 | sed 's:/*$::'`" shift $TARGET/lisp/lisp \ - -noinit -nositeinit -batch "$@" <<EOF || exit 3 + -noinit -nositeinit "$@" <<EOF || exit 3 (in-package :cl-user) (setf lisp::*enable-package-locked-errors* nil) diff --git a/src/clx/dependent.lisp b/src/clx/dependent.lisp index c63af8ef5805e15cf1e2f0d57292dd20dca6ffdf..1334fa0595d24187cc1c5ce8e1d97fda4b4f0fe6 100644 --- a/src/clx/dependent.lisp +++ b/src/clx/dependent.lisp @@ -2942,7 +2942,7 @@ Returns a list of (host display-number screen protocol)." (defmacro with-underlying-simple-vector ((variable element-type pixarray) &body body) (declare (ignore element-type)) - `(#+cmu kernel::with-array-data #+sbcl sb-kernel:with-array-data + `(#+cmu lisp::with-array-data #+sbcl sb-kernel:with-array-data ((,variable ,pixarray) (start) (end)) (declare (ignore start end)) ,@body)) diff --git a/src/clx/provide.lisp b/src/clx/provide.lisp index 4109482573271ac63e0043805ef16b78f8ce7861..208e42d69755d78bb21bef8c66607ac9bb801544 100644 --- a/src/clx/provide.lisp +++ b/src/clx/provide.lisp @@ -18,6 +18,8 @@ (provide :clx) +#-cmu +(progn (defvar *clx-source-pathname* (pathname "/src/local/clx/*.l")) @@ -49,3 +51,4 @@ (if *compile-clx* (compile-clx *clx-source-pathname* *clx-binary-pathname*) (load-clx *clx-binary-pathname*)) +) \ No newline at end of file