| ... |
... |
@@ -107,11 +107,6 @@ |
|
107
|
107
|
\"contrib-games-feebs\", \"contrib-hist\", \"contrib-psgraph\",
|
|
108
|
108
|
\"contrib-ops\", \"contrib-embedded-c\", \"contrib-sprof\", and
|
|
109
|
109
|
\"contrib-packed-sse2\". "
|
|
110
|
|
- ;; First, load asdf if it's not already loaded. This is needed to
|
|
111
|
|
- ;; load easily the contribs that use asdf. There are no contribs
|
|
112
|
|
- ;; that use defsystem, so we won't autoload defsystem.
|
|
113
|
|
- (unless (featurep :asdf)
|
|
114
|
|
- (load "modules:asdf/asdf"))
|
|
115
|
110
|
(let ((saved-modules (copy-list *modules*))
|
|
116
|
111
|
(module-name (module-name-string module-name)))
|
|
117
|
112
|
(unless (member module-name *modules* :test #'string=)
|
| ... |
... |
@@ -124,8 +119,14 @@ |
|
124
|
119
|
;; any asdf version, if asdf is loaded.
|
|
125
|
120
|
(or (some (lambda (p) (funcall p module-name))
|
|
126
|
121
|
*cmucl-provider-functions*)
|
|
127
|
|
- (some (lambda (p) (funcall p module-name))
|
|
128
|
|
- *module-provider-functions*)
|
|
|
122
|
+ (progn
|
|
|
123
|
+ ;; Load asdf if it's not already loaded. This is needed to
|
|
|
124
|
+ ;; load easily the contribs that use asdf. There are no contribs
|
|
|
125
|
+ ;; that use defsystem, so we won't autoload defsystem.
|
|
|
126
|
+ (unless (featurep :asdf)
|
|
|
127
|
+ (load "modules:asdf/asdf"))
|
|
|
128
|
+ (some (lambda (p) (funcall p module-name))
|
|
|
129
|
+ *module-provider-functions*))
|
|
129
|
130
|
(error (intl:gettext "Don't know how to load ~A") module-name)))))
|
|
130
|
131
|
(set-difference *modules* saved-modules)))
|
|
131
|
132
|
|