From d15afa61c4854eddb4b61e3d8772590db760c565 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Mon, 8 Oct 2012 08:49:41 +0300 Subject: [PATCH] allow SB-CONTRIB operation without explicitly set CC Fall back to "cc" with a style-warning. --- contrib/sb-grovel/def-to-lisp.lisp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/sb-grovel/def-to-lisp.lisp b/contrib/sb-grovel/def-to-lisp.lisp index e8bcc3d..97f2435 100644 --- a/contrib/sb-grovel/def-to-lisp.lisp +++ b/contrib/sb-grovel/def-to-lisp.lisp @@ -192,10 +192,12 @@ code: (unless (do-not-grovel component) (let* ((cc (or (and (string/= (sb-ext:posix-getenv "CC") "") (sb-ext:posix-getenv "CC")) - ;; It might be nice to include a CONTINUE or - ;; USE-VALUE restart here, but ASDF seems to insist - ;; on handling the errors itself. - (error "The CC environment variable has not been set in SB-GROVEL. Since this variable should always be set during the SBCL build process, this might indicate an SBCL with a broken contrib installation."))) + (if (member :sb-building-contrib *features*) + (error "~@") + (sb-int:style-warn + "CC environment variable not set, SB-GROVEL falling back to \"cc\".")) + "cc")) (code (sb-ext:process-exit-code (sb-ext:run-program cc -- 1.7.10.4