mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 08:43:40 -07:00
Fix parallel bootstrap build in lisp/ on MS-Windows.
Fix parallel builds: make sure loaddefs.el is not being written while Lisp files are compiled. lisp/makefile.w32-in (compile): Don't depend on 'mh-autoloads'. (compile-CMD, compile-SH): Depend on 'autoloads'. (bootstrap): Don't depend on 'autoloads' and 'mh-autoloads'.
This commit is contained in:
parent
ff88beb855
commit
8a26b487f2
2 changed files with 10 additions and 4 deletions
|
|
@ -5,6 +5,12 @@
|
|||
|
||||
2012-06-09 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
Fix parallel builds: make sure loaddefs.el is not being written
|
||||
while Lisp files are compiled.
|
||||
(compile): Don't depend on 'mh-autoloads'.
|
||||
(compile-CMD, compile-SH): Depend on 'autoloads'.
|
||||
(bootstrap): Don't depend on 'autoloads' and 'mh-autoloads'.
|
||||
|
||||
* makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200. (Bug#11649)
|
||||
|
||||
2012-06-09 Chong Yidong <cyd@gnu.org>
|
||||
|
|
|
|||
|
|
@ -316,16 +316,16 @@ TAGS-LISP-CMD: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsf
|
|||
# compiled find the right files.
|
||||
|
||||
# Need separate version for sh and native cmd.exe
|
||||
compile: $(lisp)/subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
|
||||
compile: $(lisp)/subdirs.el compile-$(SHELLTYPE) doit
|
||||
|
||||
compile-CMD:
|
||||
compile-CMD: autoloads
|
||||
# -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
|
||||
for %%f in ($(COMPILE_FIRST)) do \
|
||||
$(emacs) -l loaddefs $(BYTE_COMPILE_FLAGS) -f batch-byte-compile-if-not-done %%f
|
||||
for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do \
|
||||
$(emacs) -l loaddefs $(BYTE_COMPILE_FLAGS) -f batch-byte-compile-if-not-done %%f/%%g
|
||||
|
||||
compile-SH:
|
||||
compile-SH: autoloads
|
||||
# for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
|
||||
for el in $(COMPILE_FIRST); do \
|
||||
echo Compiling $$el; \
|
||||
|
|
@ -501,7 +501,7 @@ bootstrap-clean-SH:
|
|||
# When done, remove bootstrap-emacs from ../bin, so that
|
||||
# it will not be mistaken for an installed binary.
|
||||
|
||||
bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
|
||||
bootstrap: update-subdirs compile finder-data custom-deps
|
||||
- $(DEL) "$(EMACS)"
|
||||
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue