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

fix(cli): void-variable comp-native-version-dir

Browse source 
There weren't enough checks that we were truly in a native-comp build of
Emacs. Not the most elegant solution, but the CLI rewrite handles this
far better so it'll do for now.

Fix #5131
This commit is contained in:
Henrik Lissner 2021-10-05 01:58:41 +02:00
parent 62c25afd0f
commit 5678a837dd
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/cli/packages.el
View file

@ -224,20 +224,23 @@ list remains lean."
(defun doom--write-missing-eln-errors () (defun doom--write-missing-eln-errors ()
"Write .error files for any expected .eln files that are missing." "Write .error files for any expected .eln files that are missing."
(cl-loop for file in doom--eln-output-expected (when (and (require 'comp nil t)
for eln-name = (doom--eln-file-name file) (ignore-errors (native-comp-available-p)))
for eln-file = (doom--eln-output-file eln-name) (cl-loop for file in doom--eln-output-expected
for error-file = (doom--eln-error-file eln-name) for eln-name = (doom--eln-file-name file)
unless (or (file-exists-p eln-file) for eln-file = (doom--eln-output-file eln-name)
(file-newer-than-file-p error-file file)) for error-file = (doom--eln-error-file eln-name)
do (make-directory (file-name-directory error-file) 'parents) unless (or (file-exists-p eln-file)
(write-region "" nil error-file) (file-newer-than-file-p error-file file))
(doom-log "Wrote %s" error-file)) do (make-directory (file-name-directory error-file) 'parents)
(setq doom--eln-output-expected nil)) (write-region "" nil error-file)
(doom-log "Wrote %s" error-file))
(setq doom--eln-output-expected nil)))
(defun doom--compile-site-packages () (defun doom--compile-site-packages ()
"Queue async compilation for all non-doom Elisp files." "Queue async compilation for all non-doom Elisp files."
(when (featurep 'comp) (when (and (featurep 'comp)
(ignore-errors (native-comp-available-p)))
(cl-loop with paths = (cl-loop for path in load-path (cl-loop with paths = (cl-loop for path in load-path
unless (string-prefix-p doom-local-dir path) unless (string-prefix-p doom-local-dir path)
collect path) collect path)