Changeset 14312

Timestamp:

Sep 30, 2010, 1:00:31 AM (14 years ago)

Author:

Gary Byers

Message:

Don't bind *FEATURES* in COMPILE-FILE, unless we're cross-compiling
or the :FEATURES argument was provided.

File:

• trunk/source/lib/nfcomp.lisp (modified) (4 diffs)

trunk/source/lib/nfcomp.lisp

@@ -124 +124 @@
                          (print *compile-print*)
                          load
-                         features
+                         (features nil features-p)
                          (target *fasl-target* target-p)
                          (save-local-symbols *fasl-save-local-symbols*)
@@ -140 +140 @@
                                                     *fasl-break-on-program-errors*)))
   "Compile SRC, producing a corresponding fasl file and returning its filename."
-  (let* ((backend *target-backend*))
+  (let* ((backend *target-backend*)
+         (symbols ())
+         (values ()))
     (when (and target-p (not (setq backend (find-backend target))))
       (warn "Unknown :TARGET : ~S.  Reverting to ~s ..." target *fasl-target*)
       (setq target *fasl-target*  backend *target-backend*))
-    (unless (eq *target-backend* *host-backend*)
-      (setq save-source-locations nil))
+    (if (eq *target-backend* *host-backend*)
+      (when features-p
+        (setq symbols '(*features*)
+              values (list (append (if (listp features) features (list features)) *features*))))
+      (setq symbols '(*features*)
+            values (list (setup-target-features *target-backend* *features*))
+            save-source-locations nil))
     (multiple-value-bind (output-file truename warnings-p serious-p)
         (loop
           (restart-case
-              (return (%compile-file src output-file verbose print features
-                                     save-local-symbols save-doc-strings save-definitions
-                                     save-source-locations break-on-program-errors
-                                     force backend external-format
-                                     compile-file-original-truename compile-file-original-buffer-offset))
+              (return (progv symbols values
+                        (%compile-file src output-file verbose print
+                                       save-local-symbols save-doc-strings save-definitions
+                                       save-source-locations break-on-program-errors
+                                       force backend external-format
+                                       compile-file-original-truename compile-file-original-buffer-offset)))
             (retry-compile-file ()
               :report (lambda (stream) (format stream "Retry compiling ~s" src))
@@ -169 +177 @@
 (defvar *fasl-compile-time-env* nil)
 
-(defun %compile-file (src output-file verbose print features
+(defun %compile-file (src output-file verbose print
                           save-local-symbols save-doc-strings save-definitions
                           save-source-locations break-on-program-errors
@@ -199 +207 @@
                            (backend-target-fasl-pathname
                             *target-backend*))))
-    (let* ((*features* (append (if (listp features) features (list features)) (setup-target-features target-backend *features*)))
-           (*fasl-deferred-warnings* nil) ; !!! WITH-COMPILATION-UNIT ...
+    (let* ((*fasl-deferred-warnings* nil) ; !!! WITH-COMPILATION-UNIT ...
            (*fasl-save-local-symbols* save-local-symbols)
            (*save-source-locations* save-source-locations)