mirror of https://github.com/openssl/openssl
In build.info, an IF within a clause that's skipped over shouldn't apply
If we find an IF within a clause that's skipped over, set it to be skipped as well. Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
parent
4a4e250c2a
commit
635bd409b3
|
@ -1333,7 +1333,13 @@ if ($builder eq "unified") {
|
||||||
$l1 =~ s/\\$//; $l1.$l2 }),
|
$l1 =~ s/\\$//; $l1.$l2 }),
|
||||||
# Info we're looking for
|
# Info we're looking for
|
||||||
qr/^\s*IF\[((?:\\.|[^\\\]])*)\]\s*$/
|
qr/^\s*IF\[((?:\\.|[^\\\]])*)\]\s*$/
|
||||||
=> sub { push @skip, !! $1; },
|
=> sub {
|
||||||
|
if (! @skip || $skip[$#skip] >= 0) {
|
||||||
|
push @skip, !! $1;
|
||||||
|
} else {
|
||||||
|
push @skip, -1;
|
||||||
|
}
|
||||||
|
},
|
||||||
qr/^\s*ELSIF\[((?:\\.|[^\\\]])*)\]\s*$/
|
qr/^\s*ELSIF\[((?:\\.|[^\\\]])*)\]\s*$/
|
||||||
=> sub { die "ELSIF out of scope" if ! @skip;
|
=> sub { die "ELSIF out of scope" if ! @skip;
|
||||||
die "ELSIF following ELSE" if abs($skip[$#skip]) == 2;
|
die "ELSIF following ELSE" if abs($skip[$#skip]) == 2;
|
||||||
|
|
Loading…
Reference in New Issue