chiark
/
gitweb
/
~mdw
/
clg
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gtk/gtk.lisp: Apparently when you ask for a stock Button, you get a Bin.
[clg]
/
tools
/
asdf-extensions.lisp
diff --git
a/tools/asdf-extensions.lisp
b/tools/asdf-extensions.lisp
index 89e07273a533f35f017c11eea52db1cb054c9851..a6dd160a960886ad270ba843a78df57344365edd 100644
(file)
--- a/
tools/asdf-extensions.lisp
+++ b/
tools/asdf-extensions.lisp
@@
-1,6
+1,9
@@
(in-package :asdf)
(eval-when (:load-toplevel :compile-toplevel :execute)
(in-package :asdf)
(eval-when (:load-toplevel :compile-toplevel :execute)
+ ;; ASDF defines featurep, which we don't want to clobber. As such, shadow it
+ ;; here and then reference it with a pkg-config: prefix below.
+ (shadow :featurep)
(use-package :pkg-config))
(export '(*search-library-path-on-reload* *dso-extension*
(use-package :pkg-config))
(export '(*search-library-path-on-reload* *dso-extension*
@@
-60,7
+63,7
@@
(defun load-shared-object (pathname &optional dont-save-p (reload-p dont-save-p)
(pushnew (namestring-name namestring)
*reload-shared-objects* :test #'string=)))))
(pushnew (namestring-name namestring)
*reload-shared-objects* :test #'string=)))))
-#?(or (sbcl< 1 0 22) (featurep :cmu))
+#?(or (sbcl< 1 0 22) (
pkg-config:
featurep :cmu))
(progn
(defun remove-shared-objects ()
(dolist (namestring *dont-save-shared-objects*)
(progn
(defun remove-shared-objects ()
(dolist (namestring *dont-save-shared-objects*)
@@
-152,6
+155,9
@@
(definitions :initform nil :initarg :definitions)
(defmethod output-files ((op compile-op) (c c-source-file))
(list (make-pathname :type "o" :defaults (component-pathname c))))
(defmethod output-files ((op compile-op) (c c-source-file))
(list (make-pathname :type "o" :defaults (component-pathname c))))
+(defmethod component-pathname ((c c-source-file))
+ (make-pathname :type "c" :name (component-name c)
+ :directory (pathname-directory (call-next-method))))
(defmethod perform ((op compile-op) (c c-source-file))
(unless
(defmethod perform ((op compile-op) (c c-source-file))
(unless