[Emacs-diffs] emacs-26 1d79c2e: Work around dumping bug on GNU/Linux ppc64le

[Paul Eggert]

branch: emacs-26
commit 1d79c2ebd9bd9aa36586e57463502373c0296d11
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Work around dumping bug on GNU/Linux ppc64le
    
    Problem reported by Thomas Fitzsimmons (Bug#33174).
    Do not merge to master, as we have a better fix there.
    * src/Makefile.in (emacs$(EXEEXT)):
    (bootstrap-emacs$(EXEEXT)):
    Unset EMACS_HEAP_EXEC before invoking temacs.
---
 src/Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Makefile.in b/src/Makefile.in
index 6ed8f3c..53c18e7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -534,6 +534,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else
+       unset EMACS_HEAP_EXEC; \
        LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
   ifneq ($(PAXCTL_dumped),)
        $(PAXCTL_dumped) $@
@@ -739,6 +740,7 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
 ifeq ($(CANNOT_DUMP),yes)
        ln -f temacs$(EXEEXT) $@
 else
+       unset EMACS_HEAP_EXEC; \
        $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
   ifneq ($(PAXCTL_dumped),)
        $(PAXCTL_dumped) emacs$(EXEEXT)