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

Comparing COMP/SCRAM/src/Utilities/Architecture.pm (file contents):
Revision 1.5 by sashby, Wed Aug 17 11:11:48 2005 UTC vs.
Revision 1.6 by sashby, Mon May 15 15:52:28 2006 UTC

# Line 140 | Line 140 | sub parse_architecture_map()
140           {
141           # Store the matched string:
142           $matches->{$archstring}=1;
143 <        
144 <         if ((my $nkeys = keys %{$matches}) > 1)
145 <            {
146 <            print "\n";
147 <            print "SCRAM: WARNING: more than one architecture definition in ","\n";
148 <            print "       SCRAM_SITE matches current platform!","\n";
149 <            print "Unable to set the architecture correctly!","\n";
150 <            print "\n";
151 <            exit(1);
152 <            }
153 <        
154 <         # Store the match (only the *first* match in the case
155 <         # of multiple matches):
143 >         # Store the match. We take the first match then return:
144           $self->arch($archstring);
157
145           # Also take the arch stem from the arch string. E.g. for a string
146           # "slc3_ia32_xxx", keep the "slc3_ia32" part:
147           if (my ($sysname,$cpuarch) = ($archstring =~ /(.*?)\_(.*?)\_.*?$/))
# Line 167 | Line 154 | sub parse_architecture_map()
154              # Just set the stem to be the same as the main arch string:
155              $self->system_arch_stem($archstring);
156              }
157 +         return;
158           }
159        else
160           {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines