From 36b3f1b61fcf6bd022fcc0c23ed6efbadb393a25 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 18 Nov 2015 11:42:29 -0500
Subject: [PATCH] * lisp/loadup.el: Set max-lisp-eval-depth here
* lisp/Makefile.in (BIG_STACK_DEPTH, BIG_STACK_OPTS): Remove.
(BYTE_COMPILE_FLAGS): Adjust accordingly.
---
lisp/Makefile.in | 9 +--------
lisp/loadup.el | 4 ++++
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ed1246b0cf4..2ad16ed4070 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -89,15 +89,8 @@ AUTOGENEL = loaddefs.el \
cedet/srecode/loaddefs.el \
org/org-loaddefs.el
-# Value of max-lisp-eval-depth when compiling initially.
-# During bootstrapping the byte-compiler is run interpreted when compiling
-# itself, and uses more stack than usual.
-#
-BIG_STACK_DEPTH = 2200
-BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
-
# Set load-prefer-newer for the benefit of the non-bootstrappers.
-BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \
+BYTE_COMPILE_FLAGS = \
--eval '(setq load-prefer-newer t)' $(BYTE_COMPILE_EXTRA_FLAGS)
# Files to compile before others during a bootstrap. This is done to
diff --git a/lisp/loadup.el b/lisp/loadup.el
index f0caa8be349..ef7f19fbddb 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -60,6 +60,10 @@
(let ((dir (car load-path)))
;; We'll probably overflow the pure space.
(setq purify-flag nil)
+ ;; Value of max-lisp-eval-depth when compiling initially.
+ ;; During bootstrapping the byte-compiler is run interpreted when
+ ;; compiling itself, which uses a lot more stack than usual.
+ (setq max-lisp-eval-depth 2200)
(setq load-path (list (expand-file-name "." dir)
(expand-file-name "emacs-lisp" dir)
(expand-file-name "language" dir)
--
2.39.5