From: Po Lu <luangruo@yahoo.com>
Date: Sun, 31 Jul 2022 02:55:06 +0000 (+0800)
Subject: Fix NS unexec build
X-Git-Tag: emacs-29.0.90~1447^2~628
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d6af11c42453065d5ace1223fe99228b7927318;p=emacs.git

Fix NS unexec build

* nextstep/Makefile.in (all): Only build Emacs.pdmp on pdumper
builds.

* src/sheap.h: Make STATIC_HEAP_SIZE bigger, otherwise I get:
static heap exhausted: avail 67108864 used 67101824 failed
request 20480
---

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 9c7059f2c0b..ee883f3cff9 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -45,7 +45,11 @@ ns_check_file = @ns_appdir@/@ns_check_file@
 
 .PHONY: all
 
-all: ${ns_appdir} ${ns_appbindir}/Emacs ${ns_applibexecdir}/Emacs.pdmp
+ifeq ($(DUMPING),pdumper)
+ns_pdump_target = ${ns_applibexecdir}/Emacs.pdmp
+endif
+
+all: ${ns_appdir} ${ns_appbindir}/Emacs ${ns_pdmp_target}
 
 ${ns_check_file}: ${ns_appdir}
 
diff --git a/src/sheap.h b/src/sheap.h
index 9133f0b292f..cef111bc2f9 100644
--- a/src/sheap.h
+++ b/src/sheap.h
@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 /* Size of the static heap.  Guess a value that is probably too large,
    by up to a factor of four or so.  Typically the unused part is not
    paged in and so does not cost much.  */
-enum { STATIC_HEAP_SIZE = sizeof (Lisp_Object) << 23 };
+enum { STATIC_HEAP_SIZE = sizeof (Lisp_Object) << 24 };
 
 extern char bss_sbrk_buffer[STATIC_HEAP_SIZE];
 extern char *max_bss_sbrk_ptr;