提交 ee9b0bbb 编写于 作者: R Richard Levitte

Register the name of the config file each config target was found in

Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 3c0c68ae
......@@ -921,6 +921,8 @@ my %target = resolve_config($target);
&usage if (!%target || $target{template});
my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
$config{conf_files} = [ sort keys %conf_files ];
%target = ( %{$table{DEFAULTS}}, %target );
$target{exe_extension}="";
......@@ -2209,7 +2211,8 @@ sub read_config {
close(CONFFILE);
my %targets = ();
{
local %table = %::table; # Protect %table from tampering
# Protect certain tables from tampering
local %table = %::table;
eval $content;
warn $@ if $@;
......@@ -2224,7 +2227,9 @@ sub read_config {
warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
}
delete $targets{$_};
}
} else {
$targets{$_}->{_conf_fname_int} = add([ $fname ]);
}
}
%table = (%table, %targets);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册