Merge from trunk

[gnu-emacs] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 2f92578b5168137d461205b723dc74c5f7dadaa0..374358e4aa36289755843a76636a94fb61fd6b84 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -70,12 +70,20 @@ AUTOGENEL = loaddefs.el \
        cedet/ede/loaddefs.el \
        cedet/srecode/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 = 1000
+BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
+
 # Files to compile before others during a bootstrap.  This is done to
 # speed up the bootstrap process.
 
 COMPILE_FIRST = \
        $(lisp)/emacs-lisp/bytecomp.elc \
        $(lisp)/emacs-lisp/byte-opt.elc \
+       $(lisp)/emacs-lisp/macroexp.elc \
        $(lisp)/emacs-lisp/autoload.elc
 
 # The actual Emacs command run in the targets below.
@@ -194,7 +202,9 @@ compile-onefile:
        @echo Compiling $(THEFILE)
        @# Use byte-compile-refresh-preloaded to try and work around some of
        @# the most common bootstrapping problems.
-       @$(emacs) -l bytecomp -f byte-compile-refresh-preloaded $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $(THEFILE)
+       @$(emacs) -l bytecomp.el -f byte-compile-refresh-preloaded \
+               $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) \
+               -f batch-byte-compile $(THEFILE)
 
 # Files MUST be compiled one by one. If we compile several files in a
 # row (i.e., in the same instance of Emacs) we can't make sure that
@@ -209,7 +219,8 @@ compile-onefile:
 # cannot have prerequisites.
 .el.elc:
        @echo Compiling $<
-       @$(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $<
+       @$(emacs) $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) \
+               -f batch-byte-compile $<
 
 .PHONY: compile-first compile-main compile compile-always