ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/BuildSystem/BuildSetup.pm
(Generate patch)

Comparing COMP/SCRAM/src/BuildSystem/BuildSetup.pm (file contents):
Revision 1.16 by sashby, Mon Oct 1 16:11:07 2001 UTC vs.
Revision 1.22 by sashby, Fri Apr 12 16:42:08 2002 UTC

# Line 248 | Line 248 | sub BuildSetup
248     # Do a datestamp check so that make will build files that have changed
249     # rather than just those which are older than their dependencies
250     # The main build here
251 +
252     $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config);
253  
254 <   my $gmakejobsflag = "-j";
255 <   chomp(my $currentOS = `uname`);
254 >   # Be verbose:
255 >   $self->verbose(">> Going to use ".$ENV{DefaultMakefile}." as the default makefile");
256    
257 <   # 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 <
271 <   # Print a little debug message:
272 <   print "\n","scram BUILDSYSTEM(v1.0) >> Scram has determined that your system has ",$ncpu," CPU(s).","\n";
257 >   my $gmakejobsflag = "-j";
258     # Temporarily hard-code ncpu as 1:
259 < #   $ncpu = 1;
260 <   print "                        >> Multi-CPU builds not supported yet.","\n\n";
276 <  
277 <   # Modify: try to force make to spawn more than one job (option: -j ).
259 >   my $ncpu = 1;
260 >
261     $rv=system("gmake","--no-print-directory","$gmakejobsflag","$ncpu","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
262  
263     return $rv/256; # return the exit status of gmake

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines