From 842c641c57b6cc6ffa82ca6a74df655d8369e9e1 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Wed, 17 Aug 2022 22:47:05 +0200 Subject: [PATCH] * lisp/loadup.el: Always fix-up all loaded compilation units --- lisp/loadup.el | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/lisp/loadup.el b/lisp/loadup.el index 17e82cc0c49..634a3314361 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -478,17 +478,12 @@ lost after dumping"))) ;; installed or if the source directory got moved. This is set to be ;; a pair in the form of: ;; (rel-filename-from-install-bin . rel-filename-from-local-bin). - (let ((h (make-hash-table :test #'eq)) - (bin-dest-dir (cadr (member "--bin-dest" command-line-args))) + (let ((bin-dest-dir (cadr (member "--bin-dest" command-line-args))) (eln-dest-dir (cadr (member "--eln-dest" command-line-args)))) (when (and bin-dest-dir eln-dest-dir) (setq eln-dest-dir (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/")) - (mapatoms (lambda (s) - (let ((f (symbol-function s))) - (when (subr-native-elisp-p f) - (puthash (subr-native-comp-unit f) nil h))))) - (maphash (lambda (cu _) + (maphash (lambda (_ cu) (let* ((file (native-comp-unit-file cu)) (preloaded (equal (substring (file-name-directory file) -10 -1) @@ -508,7 +503,7 @@ lost after dumping"))) bin-dest-dir) ;; Relative filename from the built uninstalled binary. (file-relative-name file invocation-directory))))) - h)))) + comp-loaded-comp-units-h)))) (when (hash-table-p purify-flag) (let ((strings 0) -- 2.39.5