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 9c7059f2c0bce9cf159988cc24151245b0f6bd47..ee883f3cff975d3e00e797d3ec3f9195642a0623 100644 (file)
--- 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 9133f0b292fb72dce358ab125139a07a406dd58d..cef111bc2f9a916ca07d4a3b1df07a0e704d17b4 100644 (file)
--- 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;