X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/6dfb20397142408cc4adfa437bb12d8aa300270e..7079309309ff13315e41e20261d466a98f9314bb:/tools/asdf-extensions.lisp diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp index 016ff46..a6dd160 100644 --- a/tools/asdf-extensions.lisp +++ b/tools/asdf-extensions.lisp @@ -1,6 +1,9 @@ (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* @@ -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=))))) -#?(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*)