X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/e0808c472145fc81e52898bc9ac289e10c4f4f41..e046c3f65a8f7241889fb9b6005aac21e2aad1a8:/src/parser/package.lisp

diff --git a/src/parser/package.lisp b/src/parser/package.lisp
index 811440c..e3e363d 100644
--- a/src/parser/package.lisp
+++ b/src/parser/package.lisp
@@ -29,10 +29,13 @@
 
 	;; Try to find Gray streams support from somewhere.  ECL tucks them
 	;; somewhere unhelpful.
-	#+sbcl #:sb-gray
-	#+cmu #:extensions
-	#+ecl #.(if (find-package '#:gray) '#:gray '#:si)
-	#+clisp #:gray
-	#-(or sbcl cmu ecl clisp) ...))
+	#.(or (car '(#+sbcl #:sb-gray
+		     #+cmu #:extensions
+		     #+ecl #.(if (find-package '#:gray) '#:gray '#:si)
+		     #+clisp #:gray))
+	      (error "Unsupported Lisp (can't find Gray streams)")))
+
+  ;; CMUCL's `extensions' package has lots of cruft.  Use our cruft instead.
+  #+cmu (:shadowing-import-from #:sod-utilities #:symbolicate #:once-only))
 
 ;;;----- That's all, folks --------------------------------------------------