File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 3535 sysctl hw.physmem
3636 sysctl hw.usermem
3737 CPU=$(sysctl -n hw.ncpu)
38- export HARNESS_OPTIONS=j$CPU
38+ export HARNESS_OPTIONS=j$CPU MAKEFLAGS=-j$CPU
3939 perl -V
4040 perl Makefile.PL
4141 make test
Original file line number Diff line number Diff line change @@ -225,7 +225,7 @@ sub is_make_type {
225225 if $type eq ' gmake' and $minus_v =~ / GNU make/i ;
226226 return $maketype2true {$type } = 1
227227 if $type eq ' bsdmake'
228- and $minus_v =~ / ^usage: make \[ -BeikNnqrstWwX \] /im ;
228+ and $minus_v =~ / ^usage:.* make\s * \[ -B /im ;
229229 $maketype2true {$type } = 0; # it wasn't whatever you asked
230230}
231231
Original file line number Diff line number Diff line change @@ -3471,14 +3471,16 @@ sub replace_manpage_separator {
34713471
34723472=item cd
34733473
3474+ On BSD make, will add a countervailing C<cd .. > on each command since
3475+ parallel builds run all the commands in a recipe in the same shell.
3476+
34743477=cut
34753478
34763479sub cd {
34773480 my ($self , $dir , @cmds ) = @_ ;
3478-
3481+ @cmds = map " $_ && cd $Updir " , @cmds if $self -> is_make_type( ' bsdmake ' );
34793482 # No leading tab and no trailing newline makes for easier embedding
3480- my $make_frag = join " \n\t " , map { " cd $dir && $_ " } @cmds ;
3481-
3483+ my $make_frag = join " \n\t " , map " cd $dir && $_ " , @cmds ;
34823484 return $make_frag ;
34833485}
34843486
You can’t perform that action at this time.
0 commit comments