mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

* lisp/loadup.el: Always fix-up all loaded compilation units

Browse Source
This commit is contained in:
Andrea Corallo 2022-08-17 22:47:05 +02:00
parent aea05a5dec
commit 842c641c57
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/loadup.el
View File

@ -478,17 +478,12 @@ lost after dumping")))
;; installed or if the source directory got moved. This is set to be ;; installed or if the source directory got moved. This is set to be
;; a pair in the form of: ;; a pair in the form of:
;; (rel-filename-from-install-bin . rel-filename-from-local-bin). ;; (rel-filename-from-install-bin . rel-filename-from-local-bin).
(let ((h (make-hash-table :test #'eq)) (let ((bin-dest-dir (cadr (member "--bin-dest" command-line-args)))
(bin-dest-dir (cadr (member "--bin-dest" command-line-args)))
(eln-dest-dir (cadr (member "--eln-dest" command-line-args)))) (eln-dest-dir (cadr (member "--eln-dest" command-line-args))))
(when (and bin-dest-dir eln-dest-dir) (when (and bin-dest-dir eln-dest-dir)
(setq eln-dest-dir (setq eln-dest-dir
(concat eln-dest-dir "native-lisp/" comp-native-version-dir "/")) (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
(mapatoms (lambda (s) (maphash (lambda (_ cu)
(let ((f (symbol-function s)))
(when (subr-native-elisp-p f)
(puthash (subr-native-comp-unit f) nil h)))))
(maphash (lambda (cu _)
(let* ((file (native-comp-unit-file cu)) (let* ((file (native-comp-unit-file cu))
(preloaded (equal (substring (file-name-directory file) (preloaded (equal (substring (file-name-directory file)
-10 -1) -10 -1)
@ -508,7 +503,7 @@ lost after dumping")))
bin-dest-dir) bin-dest-dir)
;; Relative filename from the built uninstalled binary. ;; Relative filename from the built uninstalled binary.
(file-relative-name file invocation-directory))))) (file-relative-name file invocation-directory)))))
h)))) comp-loaded-comp-units-h))))
(when (hash-table-p purify-flag) (when (hash-table-p purify-flag)
(let ((strings 0) (let ((strings 0)