From: Alan Mackenzie <acm@muc.de>
Date: Fri, 16 Oct 2020 16:25:19 +0000 (+0000)
Subject: Make lisp/progmodes/js.el dependent on CC Mode in the Makefile.
X-Git-Tag: emacs-27.1.90~103^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30305b543d;p=emacs.git

Make lisp/progmodes/js.el dependent on CC Mode in the Makefile.

This will prevent version mismatches between compile time and runtime
versions.  This fixes bug #43037.

* lisp/Makefile.in: Make js.el dependent on cc-{defs,engine,mode}.elc.
---

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 57527bb5afc..dac62cedec2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -525,4 +525,10 @@ $(lisp)/progmodes/cc-mode.elc: $(lisp)/progmodes/cc-langs.elc \
 $(lisp)/progmodes/cc-styles.elc: $(lisp)/progmodes/cc-vars.elc \
    $(lisp)/progmodes/cc-align.elc
 
+# https://debbugs.gnu.org/43037
+# js.elc (like all modes using CC Mode's compile time macros) needs to
+# be compiled under the same version of CC Mode it will run with.
+$(lisp)/progmodes/js.elc: $(lisp)/progmodes/cc-defs.elc \
+   $(lisp)/progmodes/cc-engine.elc $(lisp)/progmodes/cc-mode.elc
+
 # Makefile ends here.