emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: move nativecomp deny-list to doom-packages

Browse source 
Also removes $EMACSDIR/eln-cache from native-comp-eln-load-path, to
reduce any chance of this taking precedence later.
This commit is contained in:
Henrik Lissner 2022-08-10 14:13:46 +02:00
parent 61ff5a4421
commit 05b344a852
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/doom-packages.el
View file

@ -107,6 +107,23 @@ uses a straight or package.el command directly).")
(doom-package-pinned-list)))
;;
;;; native-comp
(when NATIVECOMP
(after! comp
;; HACK Disable native-compilation for some troublesome packages
(mapc (doom-partial #'add-to-list 'native-comp-deferred-compilation-deny-list)
(let ((local-dir-re (concat "\\`" (regexp-quote doom-local-dir))))
(list (concat local-dir-re ".*/emacs-jupyter.*\\.el\\'")
(concat local-dir-re ".*/evil-collection-vterm\\.el\\'")
(concat local-dir-re ".*/with-editor\\.el\\'")))))
;; Remove unwanted $EMACSDIR/eln-cache/ directory.
(cl-callf2 delete (file-name-concat doom-emacs-dir "eln-cache/")
native-comp-eln-load-path))
;;
;;; Bootstrappers

10
lisp/doom.el
View file

@ -294,15 +294,7 @@ users).")
(when NATIVECOMP
;; Don't store eln files in ~/.emacs.d/eln-cache (where they can easily be
;; deleted by 'doom upgrade').
(add-to-list 'native-comp-eln-load-path (concat doom-cache-dir "eln/"))
(with-eval-after-load 'comp
;; HACK Disable native-compilation for some troublesome packages
(mapc (apply-partially #'add-to-list 'native-comp-deferred-compilation-deny-list)
(let ((local-dir-re (concat "\\`" (regexp-quote doom-local-dir))))
(list (concat local-dir-re ".*/emacs-jupyter.*\\.el\\'")
(concat local-dir-re ".*/evil-collection-vterm\\.el\\'")
(concat local-dir-re ".*/with-editor\\.el\\'"))))))
(add-to-list 'native-comp-eln-load-path (file-name-concat doom-cache-dir "eln/")))
;;