From ef6b8673419b72c67d48ffba916d2a59e1bb7cf0 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Fri, 12 Dec 2003 12:03:59 +0000
Subject: Revert the last two commits.  It seems that compat mode is actually
 faster than non-compat (using -j1), though reading the make(1) sources
 suggests that the opposite is true.

---
 tools/tools/tinderbox/tinderbox.pl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl
index f0aaf86..5db0707 100644
--- a/tools/tools/tinderbox/tinderbox.pl
+++ b/tools/tools/tinderbox/tinderbox.pl
@@ -207,7 +207,9 @@ sub spawn($@) {
 sub make($) {
     my $target = shift;
 
-    return spawn('/usr/bin/make', "-j$jobs", $target);
+    return spawn('/usr/bin/make',
+	($jobs > 1) ? "-j$jobs" : "-B",
+	$target);
 }
 
 sub logstage($) {
@@ -282,7 +284,7 @@ MAIN:{
     $machine = `/usr/bin/uname -m`;
     chomp($machine);
     $branch = "CURRENT";
-    $jobs = 1;
+    $jobs = 0;
     $repository = "/home/ncvs";
     $sandbox = "/tmp/tinderbox";
 
@@ -302,7 +304,7 @@ MAIN:{
 	"v|verbose+"		=> \$verbose,
 	) or usage();
 
-    if ($jobs < 1) {
+    if ($jobs < 0) {
 	error("invalid number of jobs");
     }
     if ($branch !~ m|^(\w+)$|) {
@@ -464,7 +466,8 @@ MAIN:{
 	    if $branch ne 'CURRENT';
 	$ENV{'CVSCMDARGS'} = "-D$date"
 	    if defined($date);
-	$ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} = "-j$jobs";
+	$ENV{'WORLD_FLAGS'} = $ENV{'KERNEL_FLAGS'} =
+	    ($jobs > 1) ? "-j$jobs" : "-B";
 	if ($patch) {
 	    $ENV{'LOCAL_PATCHES'} = $patch;
 	    $ENV{'PATCH_FLAGS'} = "-fs";
-- 
cgit v1.1