[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108542: Fix parallel bootstrap bu
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108542: Fix parallel bootstrap build in lisp/ on MS-Windows. |
Date: |
Fri, 02 Nov 2012 02:24:51 -0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108542
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-09 14:53:31 +0300
message:
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'.
modified:
lisp/ChangeLog
lisp/makefile.w32-in
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-09 09:59:14 +0000
+++ b/lisp/ChangeLog 2012-06-09 11:53:31 +0000
@@ -5,6 +5,12 @@
2012-06-09 Eli Zaretskii <address@hidden>
+ 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 <address@hidden>
=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in 2012-06-09 09:15:13 +0000
+++ b/lisp/makefile.w32-in 2012-06-09 11:53:31 +0000
@@ -316,16 +316,16 @@
# 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 @@
# 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)"
#
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108542: Fix parallel bootstrap build in lisp/ on MS-Windows.,
Eli Zaretskii <=