| 250 |
|
# The main build here |
| 251 |
|
$rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config); |
| 252 |
|
|
| 253 |
< |
my $gmakejobsflag = "-j"; |
| 254 |
< |
chomp(my $currentOS = `uname`); |
| 253 |
> |
# my $gmakejobsflag = "-j"; |
| 254 |
> |
# chomp(my $currentOS = `uname`); |
| 255 |
|
|
| 256 |
|
# Only use -j option if there are more then 1 cpu's..... |
| 257 |
< |
if ( $currentOS eq "Linux" ) |
| 258 |
< |
{ |
| 259 |
< |
chomp($ncpu=`cat /proc/cpuinfo | grep -c processor`); |
| 260 |
< |
} |
| 261 |
< |
elsif ( $currentOS eq "SunOS" ) |
| 262 |
< |
{ |
| 263 |
< |
($ncpu) = (`/usr/sbin/psrinfo | wc -l` =~ /\s+(\d+)/); |
| 264 |
< |
} |
| 265 |
< |
else |
| 266 |
< |
# Who knows what the OS is? Leave as default: |
| 267 |
< |
{ |
| 268 |
< |
$ncpu = 1; |
| 269 |
< |
} |
| 270 |
< |
|
| 257 |
> |
# if ( $currentOS eq "Linux" ) |
| 258 |
> |
# { |
| 259 |
> |
# chomp($ncpu=`cat /proc/cpuinfo | grep -c processor`); |
| 260 |
> |
# } |
| 261 |
> |
# elsif ( $currentOS eq "SunOS" ) |
| 262 |
> |
# { |
| 263 |
> |
# ($ncpu) = (`/usr/sbin/psrinfo | wc -l` =~ /\s+(\d+)/); |
| 264 |
> |
# } |
| 265 |
> |
# else |
| 266 |
> |
# # Who knows what the OS is? Leave as default: |
| 267 |
> |
# { |
| 268 |
> |
# $ncpu = 1; |
| 269 |
> |
# } |
| 270 |
> |
# |
| 271 |
|
# Print a little debug message: |
| 272 |
< |
print "\n","scram BUILDSYSTEM(v1.0) >> Scram has determined that your system has ",$ncpu," CPU(s).","\n"; |
| 272 |
> |
# print "\n","scram BUILDSYSTEM(v1.0) >> Scram has determined that your system has ",$ncpu," CPU(s).","\n"; |
| 273 |
|
# Temporarily hard-code ncpu as 1: |
| 274 |
< |
# $ncpu = 1; |
| 275 |
< |
print " >> Multi-CPU builds not supported yet.","\n\n"; |
| 274 |
> |
$ncpu = 1; |
| 275 |
> |
# print " >> Multi-CPU builds not supported yet.","\n\n"; |
| 276 |
|
|
| 277 |
|
# Modify: try to force make to spawn more than one job (option: -j ). |
| 278 |
|
$rv=system("gmake","--no-print-directory","$gmakejobsflag","$ncpu","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets); |
