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.
This commit is contained in:
parent
a61f15043c
commit
3b64ed3a59
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=123493
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user