# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1255533224 0
# Node ID 8ada01fa272a75c4de6a6c26d907d4a0a4ffcc53
# Parent  117859152fa50cdcd6692d4160ef74b7c7324a84
(compile-onefile): Load `bytecomp' rather than `bytecomp.el'.

diff -r 117859152fa5 -r 8ada01fa272a lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 14 15:10:09 2009 +0000
+++ b/lisp/ChangeLog	Wed Oct 14 15:13:44 2009 +0000
@@ -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 -r 117859152fa5 -r 8ada01fa272a lisp/Makefile.in
--- a/lisp/Makefile.in	Wed Oct 14 15:10:09 2009 +0000
+++ b/lisp/Makefile.in	Wed Oct 14 15:13:44 2009 +0000
@@ -1456,7 +1456,9 @@
 # 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