summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2023-02-13 10:19:31 +0100
committerAndrea Corallo <akrl@sdf.org>2023-02-13 10:19:31 +0100
commitc0681cd3477b6fce5e257ac720a32e09357ea157 (patch)
treed2acb3fe54e0bcf3e8d900a0e746ca80533e8184 /lisp/emacs-lisp
parent3969a34fa1ba1647665c662ce0a594b92f3f9d87 (diff)
downloademacs-c0681cd3477b6fce5e257ac720a32e09357ea157.tar.gz
emacs-c0681cd3477b6fce5e257ac720a32e09357ea157.tar.bz2
emacs-c0681cd3477b6fce5e257ac720a32e09357ea157.zip
Revert "Add new variable 'inhibit-native-compilation'"
This reverts commit 5fec9182dbeffa88cef6651d8c798ef9665d6681.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/comp.el35
1 files changed, 16 insertions, 19 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index ab6c8a8ea90..828e31c43bd 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3803,25 +3803,22 @@ Return the trampoline if found or nil otherwise."
(lexical-binding t))
(comp--native-compile
form nil
- ;; If we've disabled nativecomp, don't write the trampolines to
- ;; the eln cache (but create them).
- (and (not inhibit-native-compilation)
- (cl-loop
- for dir in (if native-compile-target-directory
- (list (expand-file-name comp-native-version-dir
- native-compile-target-directory))
- (comp-eln-load-path-eff))
- for f = (expand-file-name
- (comp-trampoline-filename subr-name)
- dir)
- unless (file-exists-p dir)
- do (ignore-errors
- (make-directory dir t)
- (cl-return f))
- when (file-writable-p f)
- do (cl-return f)
- finally (error "Cannot find suitable directory for output in \
-`native-comp-eln-load-path'"))))))
+ (cl-loop
+ for dir in (if native-compile-target-directory
+ (list (expand-file-name comp-native-version-dir
+ native-compile-target-directory))
+ (comp-eln-load-path-eff))
+ for f = (expand-file-name
+ (comp-trampoline-filename subr-name)
+ dir)
+ unless (file-exists-p dir)
+ do (ignore-errors
+ (make-directory dir t)
+ (cl-return f))
+ when (file-writable-p f)
+ do (cl-return f)
+ finally (error "Cannot find suitable directory for output in \
+`native-comp-eln-load-path'")))))
;; Some entry point support code.