X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fload.lisp;h=098933ebb725b9a5806dbdeff30895478d6642c5;hb=4fc9d21ae1d8a6a2f8ff70f589d5da103203de13;hp=aa1242919b74aaa58466591333a1b7ba5cbf3421;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/code/load.lisp b/src/code/load.lisp index aa12429..098933e 100644 --- a/src/code/load.lisp +++ b/src/code/load.lisp @@ -291,18 +291,21 @@ ;; could probably be shared with the read-a-keyword fop. (version (read-arg 4))) (declare (ignore ignore)) - (flet ((check-version (impl vers) - (when (string= impl implementation) - (unless (= version vers) - (error "~S was compiled for fasl file format version ~S, ~ - but we need version ~S." + (flet ((check-version (variant possible-implementation needed-version) + (when (string= possible-implementation implementation) + (unless (= version needed-version) + (error "~@<~S was compiled for ~A fasl file format ~ + version ~D, but we need version ~D.~:@>" stream + variant version - vers)) + needed-version)) t))) - (or (check-version #.sb!c:*backend-fasl-file-implementation* + (or (check-version "native code" + #.sb!c:*backend-fasl-file-implementation* #.sb!c:*backend-fasl-file-version*) - (check-version #.(sb!c:backend-byte-fasl-file-implementation) + (check-version "byte code" + #.(sb!c:backend-byte-fasl-file-implementation) sb!c:byte-fasl-file-version) (error "~S was compiled for implementation ~A, but this is a ~A." stream