| 917 |
|
} |
| 918 |
|
} |
| 919 |
|
|
| 920 |
< |
sub Arch_Start { |
| 921 |
< |
my $self=shift; |
| 922 |
< |
my $name=shift; |
| 923 |
< |
my $hashref=shift; |
| 924 |
< |
|
| 925 |
< |
$self->verbose(">> Arch_Start: NM ".$name." <<"); |
| 926 |
< |
|
| 927 |
< |
$self->{switch}->checktag($name, $hashref,'name'); |
| 928 |
< |
( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1) |
| 929 |
< |
: ($self->{Arch}=0); |
| 930 |
< |
push @{$self->{ARCHBLOCK}}, $self->{Arch}; |
| 931 |
< |
} |
| 920 |
> |
sub Arch_Start |
| 921 |
> |
{ |
| 922 |
> |
my $self=shift; |
| 923 |
> |
my $name=shift; |
| 924 |
> |
my $hashref=shift; |
| 925 |
> |
|
| 926 |
> |
$self->verbose(">> Arch_Start: NM ".$name." <<"); |
| 927 |
> |
|
| 928 |
> |
$self->{switch}->checktag($name, $hashref,'name'); |
| 929 |
> |
|
| 930 |
> |
# if ($ENV{SCRAM_ARCH} =~ /$$hashref{name}$/) |
| 931 |
> |
if ( $$hashref{name} eq $ENV{SCRAM_ARCH} ) |
| 932 |
> |
{ |
| 933 |
> |
# print "HASHREFNAME= ",$$hashref{name},"\n"; # The tag read from BuildFile |
| 934 |
> |
# print "Scram arch()? ",$ENV{SCRAM_ARCH},"\n"; # Also SCRAM_ARCH |
| 935 |
> |
$self->{Arch}=1; |
| 936 |
> |
} |
| 937 |
> |
else |
| 938 |
> |
{ |
| 939 |
> |
$self->{Arch}=0; |
| 940 |
> |
} |
| 941 |
> |
# ( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1) |
| 942 |
> |
# : ($self->{Arch}=0); |
| 943 |
> |
|
| 944 |
> |
$self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name}); |
| 945 |
> |
push @{$self->{ARCHBLOCK}}, $self->{Arch}; |
| 946 |
> |
} |
| 947 |
|
|
| 948 |
|
sub Arch_End { |
| 949 |
|
my $self=shift; |
| 1261 |
|
my $self=shift; |
| 1262 |
|
my $name=shift; |
| 1263 |
|
my $hashref=shift; |
| 1264 |
< |
|
| 1264 |
> |
## Not working yet !!!!## |
| 1265 |
|
$self->verbose(">> CompilerMap_Start: NM ".$name." <<"); |
| 1251 |
– |
|
| 1266 |
|
# We can only map compilers to already-defined architectures, so |
| 1267 |
|
# we check for 'Arch': |
| 1268 |
< |
if ( $self->{Arch} ) |
| 1269 |
< |
{ |
| 1270 |
< |
my @tagnames=keys %{$hashref}; |
| 1271 |
< |
my @tagvalues=values %{$hashref}; |
| 1268 |
> |
# if ( $self->{Arch} ) |
| 1269 |
> |
# { |
| 1270 |
> |
# my @tagnames=keys %{$hashref}; |
| 1271 |
> |
# my @tagvalues=values %{$hashref}; |
| 1272 |
|
|
| 1273 |
< |
foreach my $tag ( @tagnames ) |
| 1274 |
< |
{ |
| 1275 |
< |
$self->{switch}->checktag($name,$hashref,$tag); |
| 1276 |
< |
print GNUmakefile $tag."=".$$hashref{$tag}."\n"; |
| 1277 |
< |
# if ( defined $$hashref{'version'} ) { |
| 1278 |
< |
# print GNUmakefile "_V_".$$hashref{'version'}; |
| 1279 |
< |
# } |
| 1280 |
< |
# print GNUmakefile "=true\n"; |
| 1281 |
< |
|
| 1282 |
< |
} |
| 1273 |
> |
# foreach my $tag ( @tagnames ) |
| 1274 |
> |
# { |
| 1275 |
> |
# $self->{switch}->checktag($name,$hashref,$tag); |
| 1276 |
> |
# print GNUmakefile $tag."=".$$hashref{$tag}."\n"; |
| 1277 |
> |
|
| 1278 |
> |
# if ( defined $$hashref{'version'} ) |
| 1279 |
> |
# { |
| 1280 |
> |
# print GNUmakefile "_V_".$$hashref{'version'}; |
| 1281 |
> |
# } |
| 1282 |
> |
# print GNUmakefile "=true\n"; |
| 1283 |
> |
# } |
| 1284 |
|
# $self->{switch}->checktag($name,$hashref,'ref'); |
| 1285 |
|
|
| 1286 |
|
# # -- oo toolbox stuff |
| 1323 |
|
# $self->ParseBuildFile_Export($file); |
| 1324 |
|
# $self->_popremoteproject(); |
| 1325 |
|
# } |
| 1326 |
< |
} |
| 1327 |
< |
else |
| 1328 |
< |
{ |
| 1329 |
< |
print "No architecture defined: not possible to define a compiler-to-subarch mapping.","\n"; |
| 1330 |
< |
} |
| 1326 |
> |
# } |
| 1327 |
> |
# else |
| 1328 |
> |
# { |
| 1329 |
> |
# return; |
| 1330 |
> |
# } |
| 1331 |
|
} |
| 1332 |
|
|
| 1333 |
+ |
|
