From: Andrea Corallo Date: Fri, 11 Sep 2020 08:51:39 +0000 (+0200) Subject: By default when building native compile only what's part of the dump image X-Git-Tag: emacs-28.0.90~2727^2~449 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c58403b0f9b732e045230ce34f1b5a8460630ac;p=emacs.git 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 164e4a01f59..75563adeeed 100644 --- 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 cfc5ca55488..e1920dbc033 100644 --- 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)