]> git.eshelyaron.com Git - emacs.git/commitdiff
Work around dumping bug on GNU/Linux ppc64le
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Nov 2018 06:34:46 +0000 (22:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Nov 2018 06:35:10 +0000 (22:35 -0800)
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

index 6ed8f3cc91627133babe386fcc1d39cc608af195..53c18e7ac030f2e628d781a99f1cb269b3fd38f7 100644 (file)
@@ -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)