By default when building native compile only what's part of the dump image

To Ahead of Time compile the whole Emacs distro define NATIVE_FULL_AOT
when invoking make ex: 'make NATIVE_FULL_AOT=1'.

	* lisp/Makefile.in (NATIVE_SKIP_NONDUMP): New variable.
	(compile-main): Use it + rename NATIVE_DISABLE -> NATIVE_DISABLED.
	* lisp/emacs-lisp/comp.el
	(batch-byte-native-compile-for-bootstrap): Rename NATIVE_DISABLE
	-> NATIVE_DISABLED.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 164e4a01f59caab8a82cdac453b41f2e25827e09..75563adeeeda729e543832553ccf9175ffed78ad 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -38,6 +38,9 @@ AM_V_ELC = $(am__v_ELC_@AM_V@)
 am__v_ELC_ = $(am__v_ELC_@AM_DEFAULT_V@)
 ifeq ($(HAVE_NATIVE_COMP),yes)
 am__v_ELC_0 = @echo " ELC+ELN  " $@;
+ifndef NATIVE_FULL_AOT
+NATIVE_SKIP_NONDUMP = 1
+endif
 else
 am__v_ELC_0 = @echo "  ELC     " $@;
 endif
@@ -353,7 +356,7 @@ compile-main: gen-lisp compile-clean
        done | xargs $(XARGS_LIMIT) echo) |          \
        while read chunk; do                         \
          $(MAKE) compile-targets                    \
-                 NATIVE_DISABLE=$(NATIVE_FAST_BOOT) \
+                 NATIVE_DISABLED=$(NATIVE_SKIP_NONDUMP) \
                  TARGETS="$$chunk";                 \
        done
 

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index cfc5ca5548850b7635bff0e0a761b8aa33dd49fa..e1920dbc033ba816128e57f3bdff61a54073fcc0 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2731,7 +2731,7 @@ Ultra cheap impersonation of `batch-byte-compile'."
   "As `batch-byte-compile' but used for booststrap.
 Always generate elc files too and handle native compiler expected errors."
   (comp-ensure-native-compiler)
-  (if (equal (getenv "NATIVE_DISABLE") "1")
+  (if (equal (getenv "NATIVE_DISABLED") "1")
       (batch-byte-compile)
     (cl-assert (= 1 (length command-line-args-left)))
     (let ((byte-native-for-bootstrap t)