Changeset 13528


Ignore:
Timestamp:
Mar 12, 2010, 10:07:33 PM (9 years ago)
Author:
gz
Message:

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

Location:
branches/working-0711/ccl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl

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

    r13505 r13528  
    524524                    reload-arguments verbose optional-features
    525525                    (save-source-locations *ccl-save-source-locations*)
    526                     allow-constant-redefinition)
     526                    (allow-constant-redefinition nil allow-constant-redefinition-p))
    527527  (let* ((*build-time-optional-features* (intersection *known-optional-features* optional-features))
    528528         (*features* (append *build-time-optional-features* *features*))
    529          (*save-source-locations* save-source-locations)
    530          (*cerror-on-constant-redefinition* (not allow-constant-redefinition)))
     529         (*save-source-locations* save-source-locations))
    531530    (when *build-time-optional-features*
    532531      (setq full t))
    533532    (when full
    534533      (setq clean t kernel t reload t))
     534
    535535    (when update
    536536      (multiple-value-bind (changed conflicts new-binaries)
     
    545545      (format t "~&Rebuilding ~a using ~a"
    546546              (lisp-implementation-type)
    547               (lisp-implementation-version)))
    548     (let* ((cd (current-directory)))
     547              (lisp-implementation-version))
     548          (unless allow-constant-redefinition-p
     549      (when (or force clean update)
     550        (setq allow-constant-redefinition t))))
     551    (let* ((cd (current-directory))
     552           (*cerror-on-constant-redefinition* (not allow-constant-redefinition )))
    549553      (unwind-protect
    550554           (progn
Note: See TracChangeset for help on using the changeset viewer.