From f51d745abbce85b46fbffe751228424155b4bb10 Mon Sep 17 00:00:00 2001 From: jgarcia Date: Sat, 2 Feb 2008 23:54:56 +0000 Subject: [PATCH] Require the compiler explicitely so that asdf-ecl.lisp works --- contrib/asdf/asdf.lisp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp index 6ef901f17..e054b06f4 100644 --- a/contrib/asdf/asdf.lisp +++ b/contrib/asdf/asdf.lisp @@ -193,6 +193,7 @@ and NIL NAME and TYPE components" ((name :accessor component-name :initarg :name :documentation "Component name: designator for a string composed of portable pathname characters") (version :accessor component-version :initarg :version) + (original-depends-on :accessor component-original-depends-on :initarg :original-depends-on :initform nil) (in-order-to :initform nil :initarg :in-order-to) ;;; XXX crap name (do-first :initform nil :initarg :do-first) @@ -749,6 +750,7 @@ system.")) (defclass compile-op (operation) ((proclamations :initarg :proclamations :accessor compile-op-proclamations :initform nil) + (system-p :initarg :system-p :accessor compile-op-system-p :initform nil) (on-warnings :initarg :on-warnings :accessor operation-on-warnings :initform *compile-file-warnings-behaviour*) (on-failure :initarg :on-failure :accessor operation-on-failure @@ -770,7 +772,8 @@ system.")) (output-file (car (output-files operation c)))) (multiple-value-bind (output warnings-p failure-p) (compile-file source-file - :output-file output-file) + :output-file output-file + :system-p (compile-op-system-p operation)) ;(declare (ignore output)) (when warnings-p (case (operation-on-warnings operation) @@ -1099,6 +1102,7 @@ Returns the new tree (which probably shares structure with the old one)" :name (coerce-name name) :pathname pathname :parent parent + :original-depends-on depends-on other-args) (when (typep ret 'module) (setf (module-default-component-class ret) @@ -1312,6 +1316,7 @@ output to *VERBOSE-OUT*. Returns the shell's exit code." ;; Hook into ECL's require/provide #+ecl (progn + (require 'cmp) (defun module-provide-asdf (name) (handler-bind ((style-warning #'muffle-warning)) (let* ((*verbose-out* (make-broadcast-stream))