summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2020-10-16 16:25:19 +0000
committerAlan Mackenzie <acm@muc.de>2020-10-16 16:30:03 +0000
commit30305b543d04f5d888c6d63e314d596ca0f3baa8 (patch)
treef4d76ba419b1d184c39b34b1a4616bb3ffbb1c3c /lisp
parentc37b2a9b425a8f347015fb9404b512334b5a1f57 (diff)
downloademacs-30305b543d04f5d888c6d63e314d596ca0f3baa8.tar.gz
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/Makefile.in6
1 files changed, 6 insertions, 0 deletions
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.