1 files changed, 8 insertions, 0 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index c29c3750e59..9bc53c072ea 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -872,6 +872,11 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln)
 ## native-lisp where the *.eln files will be produced, and the exact
 ## names of those *.eln files, cannot be known in advance; we must ask
 ## Emacs to produce them.
+## If AOT native compilation is requested, we additionally
+## native-compile all the *.el files in ../lisp that need to be
+## compiled and haven't yet been compiled.  ELDONE holds the list
+## of *.el files that were already native-compiled.
+NATIVE_COMPILATION_AOT = @NATIVE_COMPILATION_AOT@
 ../native-lisp: | $(pdmp)
         @if test ! -d $@; then \
           mkdir $@ && $(MAKE) $(AM_V_NO_PD) $(elnlisp); \
@@ -882,6 +887,9 @@ elnlisp := $(addprefix ${lispsource}/,${elnlisp}) $(lisp:.elc=.eln)
                 --bin-dest $(BIN_DESTDIR) --eln-dest $(ELN_DESTDIR) \
           && cp -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT) \
           && cp -f $(pdmp) $(bootstrap_pdmp); \
+          if test $(NATIVE_COMPILATION_AOT) = yes; then \
+            $(MAKE) $(AM_V_NO_PD) -C ../lisp compile-eln-aot EMACS="../src/emacs$(EXEEXT)" ELNDONE="$(addprefix %,$(notdir $(elnlisp))))"; \
+          fi; \
         fi
 endif