(compile-onefile): Load `bytecomp' rather than `bytecomp.el'.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c1112793e7..dcf19f1f10b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * Makefile.in (compile-onefile): Load `bytecomp' rather than
+        `bytecomp.el'.
+
         * minibuffer.el (completion-pcm--merge-completions): Make sure the
         string we return is all made up of text from the completions rather
         than part from the completions and part from the input (bug#4219).
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 78e95900b72..3674385c51c 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1456,7 +1456,9 @@ ELCFILES = \
 # the most common problems of not bootstrapping from a clean state.
 compile-onefile:
         @echo Compiling $(THEFILE)
-        @$(emacs) -l bytecomp.el -f byte-compile-refresh-preloaded $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(THEFILE)
+        @# Use byte-compile-refresh-preloaded to try and work around some of
+        @# the most common bootstrapping problems.
+        @$(emacs) -l bytecomp -f byte-compile-refresh-preloaded $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(THEFILE)
 
 # Files MUST be compiled one by one. If we compile several files in a
 # row (i.e., in the same instance of Emacs) we can't make sure that