Use CANNOT_DUMP mode.

* configure.ac: Always set CANNOT_DUMP=yes.
* src/Makefile.in (emacs$(EXEEXT)): Always execute the "dump" code.
(bootstrap-emacs$(EXEEXT)): Always execute the "bootstrap" code.

diff --git a/configure.ac b/configure.ac
index 4628cfb85768f14a998fa075f425dca6cf431547..7aaf772a1be5acef14c6c91b121f1259d0a67615 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1347,10 +1347,9 @@ AC_CACHE_CHECK([whether addresses are sanitized],
 
 dnl The function dump-emacs will not be defined and temacs will do
 dnl (load "loadup") automatically unless told otherwise.
-test "x$CANNOT_DUMP" = "x" && CANNOT_DUMP=no
-case "$opsys" in
-  nacl) CANNOT_DUMP=yes ;;
-esac
+dnl
+dnl For the big-elc model, we never support dumping.
+CANNOT_DUMP=yes
 
 if test "$CANNOT_DUMP" = "yes"; then
   AC_DEFINE(CANNOT_DUMP, 1, [Define if Emacs cannot be dumped on your system.])

diff --git a/src/Makefile.in b/src/Makefile.in
index 57969d5fc58d162f714cf0ae18a436a592a2553b..e2f70e6a9f6aaed3214ac74802596cbcb2d0157c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -529,10 +529,10 @@ ${lispintdir}/characters.elc: ${charscript:.el=.elc}
 emacs$(EXEEXT): temacs$(EXEEXT) \
                 lisp.mk $(etc)/DOC $(lisp) \
                 $(lispsource)/international/charprop.el ${charsets}
+       LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else
-       LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
   ifneq ($(PAXCTL_dumped),)
        $(PAXCTL_dumped) $@
   endif
@@ -733,10 +733,10 @@ $(lispsource)/loaddefs.el: $(VCSWITNESS) | bootstrap-emacs$(EXEEXT)
 ## files from loadup.el in source form.
 bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
        $(MAKE) -C ../lisp update-subdirs
+       $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else
-       $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
   ifneq ($(PAXCTL_dumped),)
        $(PAXCTL_dumped) emacs$(EXEEXT)
   endif