diff --git a/tools/setup.lisp b/tools/setup.lisp
index 8e7fc1875043935ff48645b905738b4302240dac..4f67f905b1a08650aedc5a356f541799e8c0e0aa 100644
--- a/tools/setup.lisp
+++ b/tools/setup.lisp
@@ -124,9 +124,9 @@
 (defvar *log-file* nil)
 (defvar *last-file-position*)
 
-(defmacro with-compiler-log-file ((name) &body forms)
+(defmacro with-compiler-log-file ((name &rest wcu-keys) &body forms)
   `(if *interactive*
-       (with-compilation-unit ()
+       (with-compilation-unit (,@wcu-keys)
 	 ,@forms)
        (let ((*log-file* (open ,name :direction :output
 			       :if-exists :append
@@ -134,7 +134,7 @@
 	 (unwind-protect
 	     (let ((*error-output* *log-file*)
 		   (*last-file-position* (file-position *log-file*)))
-	       (with-compilation-unit ()
+	       (with-compilation-unit (,@wcu-keys)
 		 ,@forms))
 	   (close *log-file*)))))