aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-09 17:18:07 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-09 17:59:14 +0100
commitc47188499631a0ff07740853d60f2196a147eed9 (patch)
tree95c78a5b7ed15817d2c171178372c40de50a2b06
parent67336ea4006e83d0c90821c02b7f94bb80c24647 (diff)
downloadopenssl-c47188499631a0ff07740853d60f2196a147eed9.zip
openssl-c47188499631a0ff07740853d60f2196a147eed9.tar.gz
openssl-c47188499631a0ff07740853d60f2196a147eed9.tar.bz2
Comment away the extra checks in Configure
The "extra checks" is a debugging tool to check the config resolving mechanism. It uses Perl's smart match, which is experimental and therefore always causes Perl to give out a warning, and it causes older Perl versions to fail entirely. So, it gets commented away, but stays otherwise in place, as it may be useful again. Reviewed-by: Matt Caswell <matt@openssl.org>
-rwxr-xr-xConfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/Configure b/Configure
index 57d8a5a..eb7e54c 100755
--- a/Configure
+++ b/Configure
@@ -2058,7 +2058,7 @@ sub resolve_config {
my $target = shift;
my @breadcrumbs = @_;
- my $extra_checks = defined($ENV{CONFIGURE_EXTRA_CHECKS});
+# my $extra_checks = defined($ENV{CONFIGURE_EXTRA_CHECKS});
if (grep { $_ eq $target } @breadcrumbs) {
die "inherit_from loop! target backtrace:\n "
@@ -2158,10 +2158,10 @@ sub resolve_config {
unless(defined($table{$target}->{$_})) {
delete $table{$target}->{$_};
}
- if ($extra_checks &&
- $previous && !($add_called || $previous ~~ $table{$target}->{$_})) {
- warn "$_ got replaced in $target\n";
- }
+# if ($extra_checks &&
+# $previous && !($add_called || $previous ~~ $table{$target}->{$_})) {
+# warn "$_ got replaced in $target\n";
+# }
}
# Finally done, return the result.