Record autoloads till emacs dump

* admin/ldefs-clean.el (ldefs-clean-up): Record autoloads till emacs dump
* lisp/ldefs-boot-auto.el (batch-byte-compile): Update

Previously, autoloads were collected till loaddefs.el was generated as
part of the build. However, bootstrap-emacs does not load
loaddefs (rather it is dumped), hence we must record autoloads until the
full emacs binary is dumped.

1 files changed, 5 insertions, 3 deletions

diff --git a/admin/ldefs-clean.el b/admin/ldefs-clean.el
index 6eabe57c7e4..c227a163604 100644
--- a/admin/ldefs-clean.el
+++ b/admin/ldefs-clean.el
@@ -37,9 +37,11 @@
   "Clean up output from build and turn it into ldefs-boot-auto.el."
   (interactive)
   (goto-char (point-max))
-  ;; We only need the autoloads up till loaddefs.el is
-  ;; generated. After this, ldefs-boot.el is not needed
-  (search-backward "  GEN      loaddefs.el")
+  ;; We need to record autoloads till the point that emacs (as opposed
+  ;; to bootstrap-emacs) is dumped. After this point, we are not
+  ;; bootstrapping any more.
+  (search-backward "-l loadup dump")
+  (beginning-of-line)
   (delete-region (point) (point-max))
   (keep-lines "(autoload" (point-min) (point-max))
   (sort-lines nil (point-min) (point-max))