aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Corallo2022-08-17 22:47:05 +0200
committerAndrea Corallo2022-08-17 22:55:52 +0200
commit4bdda39f71fad19742cb9f40d9083ecf326573fd (patch)
tree5dfec501477c9cada49ce2f42fc0bdcd8b018daf
parent1a637303b4005460b011ef5b38e198cbdad01f05 (diff)
downloademacs-scratch/better-cu-fixup.tar.gz
emacs-scratch/better-cu-fixup.zip
* lisp/loadup.el: Always fix-up all loaded compilation unitsscratch/better-cu-fixup
-rw-r--r--lisp/loadup.el11
1 files 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")))
478 ;; installed or if the source directory got moved. This is set to be 478 ;; installed or if the source directory got moved. This is set to be
479 ;; a pair in the form of: 479 ;; a pair in the form of:
480 ;; (rel-filename-from-install-bin . rel-filename-from-local-bin). 480 ;; (rel-filename-from-install-bin . rel-filename-from-local-bin).
481 (let ((h (make-hash-table :test #'eq)) 481 (let ((bin-dest-dir (cadr (member "--bin-dest" command-line-args)))
482 (bin-dest-dir (cadr (member "--bin-dest" command-line-args)))
483 (eln-dest-dir (cadr (member "--eln-dest" command-line-args)))) 482 (eln-dest-dir (cadr (member "--eln-dest" command-line-args))))
484 (when (and bin-dest-dir eln-dest-dir) 483 (when (and bin-dest-dir eln-dest-dir)
485 (setq eln-dest-dir 484 (setq eln-dest-dir
486 (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/")) 485 (concat eln-dest-dir "native-lisp/" comp-native-version-dir "/"))
487 (mapatoms (lambda (s) 486 (maphash (lambda (_ cu)
488 (let ((f (symbol-function s)))
489 (when (subr-native-elisp-p f)
490 (puthash (subr-native-comp-unit f) nil h)))))
491 (maphash (lambda (cu _)
492 (let* ((file (native-comp-unit-file cu)) 487 (let* ((file (native-comp-unit-file cu))
493 (preloaded (equal (substring (file-name-directory file) 488 (preloaded (equal (substring (file-name-directory file)
494 -10 -1) 489 -10 -1)
@@ -508,7 +503,7 @@ lost after dumping")))
508 bin-dest-dir) 503 bin-dest-dir)
509 ;; Relative filename from the built uninstalled binary. 504 ;; Relative filename from the built uninstalled binary.
510 (file-relative-name file invocation-directory))))) 505 (file-relative-name file invocation-directory)))))
511 h)))) 506 comp-loaded-comp-units-h))))
512 507
513(when (hash-table-p purify-flag) 508(when (hash-table-p purify-flag)
514 (let ((strings 0) 509 (let ((strings 0)