From 6851c4f68cbb9cf15bd94e73b9c70d165d937ada Mon Sep 17 00:00:00 2001 From: Stelian Ionescu Date: Tue, 30 Apr 2013 16:22:12 +0200 Subject: [PATCH] Port groveler ASDF fix from CFFI --- src/grovel/asdf.lisp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/grovel/asdf.lisp b/src/grovel/asdf.lisp index bfe1066..3250624 100644 --- a/src/grovel/asdf.lisp +++ b/src/grovel/asdf.lisp @@ -70,18 +70,19 @@ :defaults (asdf:component-pathname c)))) (defmethod asdf:component-depends-on ((op process-op) (c process-op-input)) - (append (call-next-method) - (list (cons 'asdf:load-op (asdf::component-load-dependencies c))))) + `(#-asdf3 (asdf:load-op ,@(asdf::component-load-dependencies c)) + #+asdf3 (asdf:prepare-op ,c) + ,@(call-next-method))) (defmethod asdf:component-depends-on ((op asdf:compile-op) (c process-op-input)) (declare (ignore op)) - (append (call-next-method) - (list (list 'process-op (asdf:component-name c))))) + `((process-op ,(asdf:component-name c)) + ,@(call-next-method))) (defmethod asdf:component-depends-on ((op asdf:load-source-op) (c process-op-input)) (declare (ignore op)) - (append (call-next-method) - (list (list 'process-op (asdf:component-name c))))) + `((process-op ,(asdf:component-name c)) + ,@(call-next-method))) (defmethod asdf:perform ((op asdf:compile-op) (c process-op-input)) (let ((generated-lisp-file (asdf:output-file (make-instance 'process-op) c))) -- 2.11.4.GIT