aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2018-11-11 22:34:46 -0800
committerPaul Eggert2018-11-11 22:35:10 -0800
commit1d79c2ebd9bd9aa36586e57463502373c0296d11 (patch)
tree691fa21eb885ce730577bc00ccf5a1e498e785e0 /src
parent913c001f43350a70c8fc9d3eb846242eb63c9ae8 (diff)
downloademacs-1d79c2ebd9bd9aa36586e57463502373c0296d11.tar.gz
emacs-1d79c2ebd9bd9aa36586e57463502373c0296d11.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 6ed8f3cc916..53c18e7ac03 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -534,6 +534,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
534ifeq ($(CANNOT_DUMP),yes) 534ifeq ($(CANNOT_DUMP),yes)
535 ln -f temacs$(EXEEXT) $@ 535 ln -f temacs$(EXEEXT) $@
536else 536else
537 unset EMACS_HEAP_EXEC; \
537 LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump 538 LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
538 ifneq ($(PAXCTL_dumped),) 539 ifneq ($(PAXCTL_dumped),)
539 $(PAXCTL_dumped) $@ 540 $(PAXCTL_dumped) $@
@@ -739,6 +740,7 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
739ifeq ($(CANNOT_DUMP),yes) 740ifeq ($(CANNOT_DUMP),yes)
740 ln -f temacs$(EXEEXT) $@ 741 ln -f temacs$(EXEEXT) $@
741else 742else
743 unset EMACS_HEAP_EXEC; \
742 $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap 744 $(RUN_TEMACS) --batch $(BUILD_DETAILS) --load loadup bootstrap
743 ifneq ($(PAXCTL_dumped),) 745 ifneq ($(PAXCTL_dumped),)
744 $(PAXCTL_dumped) emacs$(EXEEXT) 746 $(PAXCTL_dumped) emacs$(EXEEXT)