diff options
author | DJ Delorie <dj@redhat.com> | 2003-06-12 20:06:52 +0400 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2003-06-12 20:06:52 +0400 |
commit | 7f74e6a363132ce81755ec7ece6c62832f813c96 (patch) | |
tree | dd69a0a1033c20e0f2f96567b52fce11d39f005a /Makefile.tpl | |
parent | 02112c7344a87bde8e1ac231e2d48e727529d123 (diff) |
Merge these:
2003-06-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Don't pass --with-stabs for mips*-sgi-irix6*o32.
* configure. Regenerate.
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.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r-- | Makefile.tpl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index d40dd5641..d660e3a4b 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -731,7 +731,7 @@ clean-target-libgcc: .PHONY: check do-check check: - $(MAKE) do-check NOTPARALLEL=parallel-ok + $(MAKE) do-check # Only include modules actually being configured and built. do-check: maybe-check-gcc [+ @@ -1298,7 +1298,7 @@ check-gcc-c++: .PHONY: 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 maybe-install-gcc: @@ -1495,12 +1495,6 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4 # 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. .NOEXPORT: MAKEOVERRIDES= |