Changeset 13528

Timestamp:

Mar 12, 2010, 2:07:33 PM (15 years ago)

Author:

gz

Message:

From trunk: default allow-constant-redefinition (r13513)

Location:

branches/working-0711/ccl

Files:

• . (modified) (1 prop)
• lib/compile-ccl.lisp (modified) (2 diffs)

branches/working-0711/ccl/lib/compile-ccl.lisp

@@ -524 +524 @@
                     reload-arguments verbose optional-features
                     (save-source-locations *ccl-save-source-locations*)
-                    allow-constant-redefinition)
+                    (allow-constant-redefinition nil allow-constant-redefinition-p))
   (let* ((*build-time-optional-features* (intersection *known-optional-features* optional-features))
          (*features* (append *build-time-optional-features* *features*))
-         (*save-source-locations* save-source-locations)
-         (*cerror-on-constant-redefinition* (not allow-constant-redefinition)))
+         (*save-source-locations* save-source-locations))
     (when *build-time-optional-features*
       (setq full t))
     (when full
       (setq clean t kernel t reload t))
+
     (when update
       (multiple-value-bind (changed conflicts new-binaries)
@@ -545 +545 @@
       (format t "~&Rebuilding ~a using ~a"
               (lisp-implementation-type)
-              (lisp-implementation-version)))
-    (let* ((cd (current-directory)))
+              (lisp-implementation-version))
+          (unless allow-constant-redefinition-p
+      (when (or force clean update)
+        (setq allow-constant-redefinition t))))
+    (let* ((cd (current-directory))
+           (*cerror-on-constant-redefinition* (not allow-constant-redefinition )))
       (unwind-protect
            (progn