diff options
| author | Richard M Kreuter <kreuter@progn.net> | 2021-05-20 11:08:40 -0400 |
|---|---|---|
| committer | Richard M Kreuter <kreuter@progn.net> | 2021-05-20 12:57:48 -0400 |
| commit | ed585f7386d8d494bac5ff8601374058689cee8f (patch) | |
| tree | e092d5a9ef980122701f5539dc8bb42c44205457 /make-target-2.sh | |
| parent | d7d3f820b4b84f0116d0f637405d2185f386e3c8 (diff) | |
Preserve COMPILE-FILE's argument & *D-P-D* through to fasls.
This consists of (a) splitting one slot into two, albeit in 3
different structures; and (b) having the old source namestring
accessors obey a new variable.
* FILE-INFO's old UNTRUENAME is now PATHNAME-1 and PATHNAME-2. The
first is the original argument (with the type filled in), and the
second is *D-P-D* if merging contributes anything to PATHNAME-1.
* DEBUG-SOURCE and SOURCE-LOCATION now have corresponding NAMESTRING-1
and NAMESTRING-2 slots, with equivalent purpose except when we're
supposed to be storing *SOURCE-NAMESTRING*.
* The new variable SB-EXT:*SOURCE-FILE-DEFAULTING* influences what namestring
introspection functions return. If it's NIL, they return
NAMESTRING-1. If it's :DEFAULT, they return the (equivalent of)
merging NAMESTRING-1 with NAMESTRING-2.
N.B., this removes the recently added SB-C::*MERGE-PATHNAMES*, since
now it's not a question what information to store at compile time, but
whether to return merged or unmerged results at inquiry time.
Diffstat (limited to 'make-target-2.sh')
| -rwxr-xr-x | make-target-2.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/make-target-2.sh b/make-target-2.sh index b37d85d0e..eafbad2b3 100755 --- a/make-target-2.sh +++ b/make-target-2.sh @@ -63,9 +63,8 @@ echo //doing warm init - load and dump phase (progn ${devel}) (sb-fasl::!warm-load "make-target-2-load.lisp") (setf (extern-alien "gc_coalesce_string_literals" char) 2) -;;; Use the historical (bad) convention for *compile-file-pathname* -(setf sb-c::*merge-pathnames* t) -;;; and for storing pathname namestrings in fasls too. +;;; Use the historical (bad) convention for storing pathname +;;; namestrings in fasls. (setq sb-c::*name-context-file-path-selector* 'truename) (let ((sb-ext:*invoke-debugger-hook* (prog1 sb-ext:*invoke-debugger-hook* (sb-ext:enable-debugger)))) (sb-ext:save-lisp-and-die "output/sbcl.core")) |