summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-01-10 09:26:22 +0100
committerRichard Levitte <levitte@openssl.org>2021-01-12 11:25:54 +0100
commit2497e2e7dbe54420cd98dc2ff013ed5886cd4d8e (patch)
tree382f1401a119f211bc7654fd6fbef906cfc6667c /Configure
parentConfigure: clean away perl syntax faults (diff)
downloadopenssl-2497e2e7dbe54420cd98dc2ff013ed5886cd4d8e.tar.xz
openssl-2497e2e7dbe54420cd98dc2ff013ed5886cd4d8e.zip
Configure: warn about duplicate GENERATE declarations in build.info files
This sort of duplication is permitted, as the end result will be a single item anyway, but we might as well warn to avoid future confusion. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13824)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/Configure b/Configure
index 87267e2a26..ccdb037de2 100755
--- a/Configure
+++ b/Configure
@@ -2325,7 +2325,7 @@ EOF
if ($generate{$gen}) {
$generator[0] = cleanfile($buildd, $gen, $blddir);
}
- $check_generate{$ddest}->{$generator[0]} = 1;
+ $check_generate{$ddest}->{$generator[0]}++;
$unified_info{generate}->{$ddest} = [ @generator ];
}
@@ -2439,6 +2439,9 @@ EOF
warn "$_ is GENERATEd by more than one generator ($generators_txt)\n";
$ambiguous_generation++;
}
+ if ($check_generate{$_}->{$generators[0]} > 1) {
+ warn "INFO: $_ has more than one GENERATE declaration (same generator)\n"
+ }
}
die "There are ambiguous source file generations\n"
if $ambiguous_generation > 0;