X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcold%2Fshared.lisp;h=62299010701d0a5122b2e686d3b5b4fdad265f0a;hb=ba7659c92f2b7fac7e9532a3db9114c5bdc4ab55;hp=e165afbe1ced6b027b182f7bd70c6344b727ef63;hpb=d3862cc781cabf52f15c2d3a164f992dbbba84f4;p=sbcl.git diff --git a/src/cold/shared.lisp b/src/cold/shared.lisp index e165afb..6229901 100644 --- a/src/cold/shared.lisp +++ b/src/cold/shared.lisp @@ -54,13 +54,14 @@ (defvar *host-obj-prefix*) (defvar *target-obj-prefix*) -;;; suffixes for filename stems when cross-compiling. Everything should work -;;; fine for any arbitrary string values here. With more work maybe we -;;; could cause these automatically to become the traditional extensions for -;;; whatever host and target architectures (e.g. ".x86f" or ".axpf") we're -;;; currently doing. That would make it easier for a human looking at the -;;; temporary files to figure out what they're for, but it's not necessary for -;;; the compilation process to work, so we haven't bothered. +;;; suffixes for filename stems when cross-compiling. Everything +;;; should work fine for any arbitrary string values here. With more +;;; work maybe we could cause these automatically to become the +;;; traditional extensions for whatever host and target architectures +;;; (e.g. ".x86f" or ".axpf") we're currently doing. That would make +;;; it easier for a human looking at the temporary files to figure out +;;; what they're for, but it's not necessary for the compilation +;;; process to work, so we haven't bothered. (defvar *host-obj-suffix* ".lisp-obj") (defvar *target-obj-suffix* ".lisp-obj") @@ -273,7 +274,7 @@ ;; warnings and remove support for this flag. -- WHN 19990323) :ignore-failure-p)) -(defparameter *stems-and-flags* (read-from-file "stems-and-flags.lisp-expr")) +(defparameter *stems-and-flags* (read-from-file "build-order.lisp-expr")) (defmacro do-stems-and-flags ((stem flags) &body body) (let ((stem-and-flags (gensym "STEM-AND-FLAGS-"))) @@ -286,7 +287,7 @@ (let ((stems (make-hash-table :test 'equal))) (do-stems-and-flags (stem flags) (if (gethash stem stems) - (error "duplicate stem ~S in stems-and-flags data" stem) + (error "duplicate stem ~S in *STEMS-AND-FLAGS*" stem) (setf (gethash stem stems) t)) (let ((set-difference (set-difference flags *expected-stem-flags*))) (when set-difference