|
From: <sv...@va...> - 2009-06-16 06:57:02
|
Author: njn
Date: 2009-06-16 07:56:53 +0100 (Tue, 16 Jun 2009)
New Revision: 10349
Log:
Cautiously enable parallel builds.
Modified:
branches/BUILD_TWEAKS/Makefile.all.am
branches/BUILD_TWEAKS/coregrind/Makefile.am
branches/BUILD_TWEAKS/nightly/README.txt
Modified: branches/BUILD_TWEAKS/Makefile.all.am
===================================================================
--- branches/BUILD_TWEAKS/Makefile.all.am 2009-06-16 06:42:46 UTC (rev 10348)
+++ branches/BUILD_TWEAKS/Makefile.all.am 2009-06-16 06:56:53 UTC (rev 10349)
@@ -8,13 +8,10 @@
inplacedir = $(top_builddir)/.in_place
+# This used to be required when Vex had a handwritten Makefile. It
+# shouldn't be needed any more, though.
+##.NOTPARALLEL:
-# The kludge that passes for vex's build system can't handle parallel
-# builds. So, for the time being, serialise all Valgrind building.
-# (this is equivalent to enforcing "make -j 1".
-# XXX: may not be necessary any more...
-.NOTPARALLEL:
-
#----------------------------------------------------------------------------
# noinst_PROGRAMS and noinst_DSYMS targets
#----------------------------------------------------------------------------
Modified: branches/BUILD_TWEAKS/coregrind/Makefile.am
===================================================================
--- branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-16 06:42:46 UTC (rev 10348)
+++ branches/BUILD_TWEAKS/coregrind/Makefile.am 2009-06-16 06:56:53 UTC (rev 10349)
@@ -109,8 +109,12 @@
/usr/include/mach/vm_map.defs
endif
-$(mach_user_srcs) $(mach_hdrs): $(mach_defs)
+# Be careful w.r.t. parellel builds. See section 27.9 of the automake info
+# page, "Handling Tools that Produce many Outputs".
+$(mach_user_srcs): $(mach_defs)
(cd m_mach && mig $(mach_defs))
+$(mach_hdrs): $(mach_defs) $(mach_user_srcs)
+ (cd m_mach && mig $(mach_defs))
#----------------------------------------------------------------------------
# Headers
Modified: branches/BUILD_TWEAKS/nightly/README.txt
===================================================================
--- branches/BUILD_TWEAKS/nightly/README.txt 2009-06-16 06:42:46 UTC (rev 10348)
+++ branches/BUILD_TWEAKS/nightly/README.txt 2009-06-16 06:56:53 UTC (rev 10349)
@@ -32,8 +32,6 @@
will be used.
ABT_JOBS: allows parallel builds -- it's passed as the argument to "make
-j" when building Valgrind and the tests. The default is 1.
- [XXX: the .NOTPARALLEL that currently resides in Makefile.all.am foils
- this!]
- conf/<tag>.sendmail: this should be a script that sends an email to the
desired recipient (eg. the valgrind-developers list). It takes three
|