diff options
author | Richard Levitte <levitte@openssl.org> | 2016-09-14 22:21:41 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-09-16 11:53:29 +0200 |
commit | efd23794121520fb1526616af2784ddc9d078280 (patch) | |
tree | e9256b6aa7c7157f6962b41dae9acaed9832779b | |
parent | ea6e2d543653196cb6d095f72b35073404c8ae33 (diff) |
Register the name of the config file each config target was found in
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit ee9b0bbb4c66812da18939ea96c4625cb001f3bd)
-rwxr-xr-x | Configure | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -904,6 +904,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}=""; @@ -2225,7 +2227,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 $@; @@ -2240,7 +2243,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); |