Commit bf1d3e81 by Nathanael Nerode

configure.in: Disable serial configure by default.

	* configure.in: Disable serial configure by default.
	* configure: Regenerate.
	* Makefile.tpl: Abolish .NOTPARALLEL.
	* Makefile.in: Regenerate.

From-SVN: r67747
parent ca895f7d
2003-06-10 Nathanael Nerode <neroden@gcc.gnu.org> 2003-06-10 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Disable serial configure by default.
* configure: Regenerate.
* Makefile.tpl: Abolish .NOTPARALLEL.
* Makefile.in: Regenerate.
* Makefile.tpl: Replace {build,host,target}_canonical by * Makefile.tpl: Replace {build,host,target}_canonical by
{build,host,target}. {build,host,target}.
* Makefile.in: Regenerate. * Makefile.in: Regenerate.
......
...@@ -17293,7 +17293,7 @@ clean-target-libgcc: ...@@ -17293,7 +17293,7 @@ clean-target-libgcc:
.PHONY: check do-check .PHONY: check do-check
check: check:
$(MAKE) do-check NOTPARALLEL=parallel-ok $(MAKE) do-check
# Only include modules actually being configured and built. # Only include modules actually being configured and built.
do-check: maybe-check-gcc \ do-check: maybe-check-gcc \
...@@ -23693,7 +23693,7 @@ check-gcc-c++: ...@@ -23693,7 +23693,7 @@ check-gcc-c++:
.PHONY: check-c++ .PHONY: check-c++
check-c++: check-c++:
$(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok $(MAKE) check-target-libstdc++-v3 check-gcc-c++
.PHONY: install-gcc maybe-install-gcc .PHONY: install-gcc maybe-install-gcc
maybe-install-gcc: maybe-install-gcc:
...@@ -23890,12 +23890,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 ...@@ -23890,12 +23890,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
# Special directives to GNU Make # Special directives to GNU Make
# ------------------------------ # ------------------------------
# Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well
# as minimizing scatter in file system caches.
NOTPARALLEL = .NOTPARALLEL
$(NOTPARALLEL):
# Don't pass command-line variables to submakes. # Don't pass command-line variables to submakes.
.NOEXPORT: .NOEXPORT:
MAKEOVERRIDES= MAKEOVERRIDES=
......
...@@ -731,7 +731,7 @@ clean-target-libgcc: ...@@ -731,7 +731,7 @@ clean-target-libgcc:
.PHONY: check do-check .PHONY: check do-check
check: check:
$(MAKE) do-check NOTPARALLEL=parallel-ok $(MAKE) do-check
# Only include modules actually being configured and built. # Only include modules actually being configured and built.
do-check: maybe-check-gcc [+ do-check: maybe-check-gcc [+
...@@ -1298,7 +1298,7 @@ check-gcc-c++: ...@@ -1298,7 +1298,7 @@ check-gcc-c++:
.PHONY: check-c++ .PHONY: check-c++
check-c++: check-c++:
$(MAKE) check-target-libstdc++-v3 check-gcc-c++ NOTPARALLEL=parallel-ok $(MAKE) check-target-libstdc++-v3 check-gcc-c++
.PHONY: install-gcc maybe-install-gcc .PHONY: install-gcc maybe-install-gcc
maybe-install-gcc: maybe-install-gcc:
...@@ -1495,12 +1495,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 ...@@ -1495,12 +1495,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
# Special directives to GNU Make # Special directives to GNU Make
# ------------------------------ # ------------------------------
# Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well
# as minimizing scatter in file system caches.
NOTPARALLEL = .NOTPARALLEL
$(NOTPARALLEL):
# Don't pass command-line variables to submakes. # Don't pass command-line variables to submakes.
.NOEXPORT: .NOEXPORT:
MAKEOVERRIDES= MAKEOVERRIDES=
......
...@@ -1698,18 +1698,25 @@ AC_SUBST_FILE(maybe_dependencies) ...@@ -1698,18 +1698,25 @@ AC_SUBST_FILE(maybe_dependencies)
# Create the serialization dependencies. This uses a temporary file. # Create the serialization dependencies. This uses a temporary file.
AC_ARG_ENABLE([serial-configure], AC_ARG_ENABLE([serial-configure],
[ --disable-serial-[{host,target,build}-]configure [ --enable-serial-[{host,target,build}-]configure
Don't force sequential configuration of Force sequential configuration of
sub-packages for the host, target or build sub-packages for the host, target or build
machine, or of any sub-packages at all]) machine, or all sub-packages])
case ${enable_serial_configure} in
yes)
enable_serial_build_configure=yes
enable_serial_host_configure=yes
enable_serial_target_configure=yes
;;
esac
# These force 'configure's to be done one at a time, to avoid problems # These force 'configure's to be done one at a time, to avoid problems
# with contention over a shared config.cache. # with contention over a shared config.cache.
rm -f serdep.tmp rm -f serdep.tmp
echo '# serdep.tmp' > serdep.tmp echo '# serdep.tmp' > serdep.tmp
olditem= olditem=
test "x${enable_serial_configure}" = xno || test "x${enable_serial_build_configure}" = xyes &&
test "x${enable_serial_build_configure}" = xno ||
for item in ${build_configdirs} ; do for item in ${build_configdirs} ; do
case ${olditem} in case ${olditem} in
"") ;; "") ;;
...@@ -1718,8 +1725,7 @@ for item in ${build_configdirs} ; do ...@@ -1718,8 +1725,7 @@ for item in ${build_configdirs} ; do
olditem=${item} olditem=${item}
done done
olditem= olditem=
test "x${enable_serial_configure}" = xno || test "x${enable_serial_host_configure}" = xyes &&
test "x${enable_serial_host_configure}" = xno ||
for item in ${configdirs} ; do for item in ${configdirs} ; do
case ${olditem} in case ${olditem} in
"") ;; "") ;;
...@@ -1728,8 +1734,7 @@ for item in ${configdirs} ; do ...@@ -1728,8 +1734,7 @@ for item in ${configdirs} ; do
olditem=${item} olditem=${item}
done done
olditem= olditem=
test "x${enable_serial_configure}" = xno || test "x${enable_serial_target_configure}" = xyes &&
test "x${enable_serial_target_configure}" = xno ||
for item in ${target_configdirs} ; do for item in ${target_configdirs} ; do
case ${olditem} in case ${olditem} in
"") ;; "") ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment