From: Andrea Corallo <akrl@sdf.org>
Date: Sat, 7 Nov 2020 11:31:37 +0000 (+0100)
Subject: * Fix non native compiled build
X-Git-Tag: emacs-28.0.90~2727^2~343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c271ffaa808c602e177db4bd2297ff81112147e;p=emacs.git

* Fix non native compiled build

	* lisp/emacs-lisp/advice.el (ad-add-advice): Do not try to
	install trampolines in vanilla builds.
---

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 509e2551914..086aa98bb0b 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2077,7 +2077,8 @@ mapped to the closest extremal position).
 If FUNCTION was not advised already, its advice info will be
 initialized.  Redefining a piece of advice whose name is part of
 the cache-id will clear the cache."
-  (when (subr-primitive-p (symbol-function function))
+  (when (and (featurep 'nativecomp)
+             (subr-primitive-p (symbol-function function)))
     (comp-subr-trampoline-install function))
   (cond ((not (ad-is-advised function))
          (ad-initialize-advice-info function)