diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-06-26 19:57:54 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-06-26 19:57:54 +0300 |
| commit | cc06e7e7107b47250ad2a91817932b8079f4bc6e (patch) | |
| tree | 09a7ab632dffb179442e5c82976ccd5fdd50d126 /lib | |
| parent | d2c32364fd1873a6e9cfa52d2531dfbe500ad297 (diff) | |
| download | emacs-cc06e7e7107b47250ad2a91817932b8079f4bc6e.tar.gz | |
Fix parallel bootstrap on MS-Windows in lib/ and lisp/.
lib/makefile.w32-in ($(GNULIBOBJS)): Depend on stamp_BLD. This
replaces separate dependency for each object file, which required
the same object file to be mentioned twice, causing failures in
parallel builds.
lisp/makefile.w32-in (compile, compile-always): Depend on
update-subdirs, not on subdirs.el. Otherwise, several different
sub-targets of 'bootstrap' running in parallel could
simultaneously write to subdirs.el, producing a garbled file.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/makefile.w32-in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 92fd7a81848..78a0de0a0ef 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -183,10 +183,7 @@ $(BLD)/filemode.$(O) : \ # The following dependencies are for supporting parallel builds, where # we must make sure $(BLD) exists before any compilation starts. # -$(BLD)/dtoastr.$(O) $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O): stamp_BLD -$(BLD)/strftime.$(O) $(BLD)/time_r.$(O) $(BLD)/md5.$(O): stamp_BLD -$(BLD)/sha1.$(O) $(BLD)/sha256.$(O) $(BLD)/sha512.$(O): stamp_BLD -$(BLD)/filemode.$(O): stamp_BLD +$(GNULIBOBJS): stamp_BLD # # Headers we would preprocess if we could. |