Skip to content

Commit 0a8fa21

Browse files
committed
Control value of *package* when compiling.
1 parent 2a58830 commit 0a8fa21

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

lisp-action.lisp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@ Note that it will NOT be called around the performing of LOAD-OP."))
110110
(when warnings-file
111111
(unless (equal (pathname-type warnings-file) (warnings-file-type))
112112
(setf warnings-file nil)))
113-
(call-with-around-compile-hook
114-
c #'(lambda (&rest flags)
115-
(apply 'compile-file* input-file
116-
:output-file output-file
117-
:external-format (component-external-format c)
118-
:warnings-file warnings-file
119-
(append
120-
#+clisp (list :lib-file lib-file)
121-
#+(or clasp ecl mkcl) (list :object-file object-file)
122-
flags)))))
113+
(let ((*package* (find-package* '#:common-lisp-user)))
114+
(call-with-around-compile-hook
115+
c #'(lambda (&rest flags)
116+
(apply 'compile-file* input-file
117+
:output-file output-file
118+
:external-format (component-external-format c)
119+
:warnings-file warnings-file
120+
(append
121+
#+clisp (list :lib-file lib-file)
122+
#+(or clasp ecl mkcl) (list :object-file object-file)
123+
flags))))))
123124
(check-lisp-compile-results output warnings-p failure-p
124125
"~/asdf-action::format-action/" (list (cons o c))))))
125126
(defun report-file-p (f)
@@ -203,7 +204,8 @@ an OPERATION and a COMPONENT."
203204
"Perform the loading of a FASL associated to specified action (O . C),
204205
an OPERATION and a COMPONENT."
205206
(if-let (fasl (first (input-files o c)))
206-
(load* fasl)))
207+
(let ((*package* (find-package '#:common-lisp-user)))
208+
(load* fasl))))
207209
(defmethod perform ((o load-op) (c cl-source-file))
208210
(perform-lisp-load-fasl o c))
209211
(defmethod perform ((o load-op) (c static-file))

0 commit comments

Comments
 (0)