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

Respect comp-eln-load-path in comp async process

Browse source 
Thanks to @SwiftLawnGnome in hlissner/doom-emacs@295f806
This commit is contained in:
Henrik Lissner 2020-08-17 21:46:54 -04:00
parent a2da5d7a6f
commit ed25ab76f9
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/core.el
View file

@ -269,15 +269,27 @@ config.el instead."
(let ((user-init-file custom-file)) (let ((user-init-file custom-file))
(apply orig-fn args))) (apply orig-fn args)))
;; For gccemacs users: http://akrl.sdf.org/gccemacs.html
;;
;;; Native Compilation support (http://akrl.sdf.org/gccemacs.html)
;; Don't store eln files in ~/.emacs.d/eln-cache (they are likely to be purged
;; when upgrading Doom).
(when (boundp 'comp-eln-load-path)
(add-to-list 'comp-eln-load-path (concat doom-cache-dir "eln/")))
(after! comp (after! comp
;; Prevent unwanted runtime builds; packages are compiled ahead-of-time when ;; Prevent unwanted runtime builds; packages are compiled ahead-of-time when
;; they are installed and site files are compiled when gccemacs is installed. ;; they are installed and site files are compiled when gccemacs is installed.
(setq comp-deferred-compilation nil) (setq comp-deferred-compilation nil)
;; Don't store eln files in ~/.emacs.d; it's likely to be purged when ;; HACK `comp-eln-load-path' isn't fully respected yet, because native
;; upgrading Doom. ;; compilation occurs in another emacs process that isn't seeded with our
(when (boundp 'comp-eln-load-path) ;; value for `comp-eln-load-path', so we inject it ourselves:
(add-to-list 'comp-eln-load-path (concat doom-cache-dir "eln/"))) (unless doom-reloading-p ; only apply this once!
(setq comp-async-env-modifier-form
`(progn
,comp-async-env-modifier-form
(setq comp-eln-load-path ',comp-eln-load-path))))
;; HACK Disable native-compilation for some troublesome packages ;; HACK Disable native-compilation for some troublesome packages
(add-to-list 'comp-deferred-compilation-black-list "/evil-collection-vterm\\.el\\'")) (add-to-list 'comp-deferred-compilation-black-list "/evil-collection-vterm\\.el\\'"))