summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2021-10-15 09:26:24 +0200
committerAndrea Corallo <akrl@sdf.org>2021-10-15 09:32:20 +0200
commitced72b6e4c03c75e99e828410c363eefd80fbf54 (patch)
tree795805cfe6ddde5d37cc98f55de26fd1f8182b73 /lisp/emacs-lisp
parent502788bc3d9cd2f95427114dbb243c62a27edb2b (diff)
downloademacs-ced72b6e4c03c75e99e828410c363eefd80fbf54.tar.gz
emacs-ced72b6e4c03c75e99e828410c363eefd80fbf54.tar.bz2
emacs-ced72b6e4c03c75e99e828410c363eefd80fbf54.zip
* Fix `native-compile-target-directory' effectiveness on trampolines
* lisp/emacs-lisp/comp.el (comp-trampoline-compile): Fix `native-compile-target-directory' effectiveness on trampoline compilation.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/comp.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 0e4e54b76bb..7b5c5ad44f7 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3789,7 +3789,9 @@ Return the trampoline if found or nil otherwise."
(comp--native-compile
form nil
(cl-loop
- for dir in (comp-eln-load-path-eff)
+ for dir in (if native-compile-target-directory
+ (list native-compile-target-directory)
+ (comp-eln-load-path-eff))
for f = (expand-file-name
(comp-trampoline-filename subr-name)
dir)