Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
asdf
asdf
Commits
4333ab31
Commit
4333ab31
authored
Sep 01, 2014
by
Francois-Rene Rideau
Browse files
Tell image-op (and program-op) about MKCL providing UIOP separately from ASDF.
parent
eaf29108
Changes
1
Hide whitespace changes
Inline
Side-by-side
bundle.lisp
View file @
4333ab31
...
...
@@ -470,6 +470,11 @@ itself.")) ;; operation on a system and its dependencies
;;(unless (or #+ecl (use-ecl-byte-compiler-p))
;; (setf *load-system-operation* 'load-bundle-op))
(
defun
uiop-library-pathname
()
#+
ecl
(
or
(
probe-file*
(
compile-file-pathname
"sys:uiop"
:type
:lib
))
;; new style
(
probe-file*
(
compile-file-pathname
"sys:uiop"
:type
:object
)))
;; old style
#+
mkcl
(
make-pathname
:type
(
bundle-pathname-type
:lib
)
:defaults
#p"sys:contrib;uiop"
))
(
defun
asdf-library-pathname
()
#+
ecl
(
or
(
probe-file*
(
compile-file-pathname
"sys:asdf"
:type
:lib
))
;; new style
(
probe-file*
(
compile-file-pathname
"sys:asdf"
:type
:object
)))
;; old style
...
...
@@ -491,10 +496,12 @@ itself.")) ;; operation on a system and its dependencies
`
(
,
(
make-library-system
"cmp"
(
compiler-library-pathname
))))
,@
(
unless
(
or
(
no-uiop
c
)
(
has-it-p
"uiop"
)
(
has-it-p
"asdf"
))
`
(
,
(
cond
((
system-source-directory
:uiop
)
(
find-system
:uiop
))
((
system-source-directory
:asdf
)
(
find-system
:asdf
))
(
t
(
make-library-system
"asdf"
(
asdf-library-pathname
))))))
`
(
cond
((
system-source-directory
:uiop
)
`
(
,
(
find-system
:uiop
)))
((
system-source-directory
:asdf
)
`
(
,
(
find-system
:asdf
)))
(
t
`
(
,@
(
if-let
(
uiop
(
uiop-library-pathname
))
`
(
,
(
make-library-system
"uiop"
uiop
)))
,
(
make-library-system
"asdf"
(
asdf-library-pathname
))))))
,@
deps
)))))
(
defmethod
perform
((
o
link-op
)
(
c
system
))
...
...
Daniel Kochmański
@dkochmanski
mentioned in issue
#2 (closed)
·
Aug 01, 2015
mentioned in issue
#2 (closed)
mentioned in issue #2
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment