summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-01-30 19:10:26 +0100
committerRichard Levitte <levitte@openssl.org>2019-01-31 16:19:50 +0100
commitda7e31e0c7be390d37b84c6200afd802def700c5 (patch)
tree36ebe7b8533c6ef59fb72e544b4594dc17fc6016 /Configure
parentBuild: Remove BEGINRAW / ENDRAW / OVERRIDE (diff)
downloadopenssl-da7e31e0c7be390d37b84c6200afd802def700c5.tar.xz
openssl-da7e31e0c7be390d37b84c6200afd802def700c5.zip
Build: remove EXTRA
We never used it for anything Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8125)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure9
1 files changed, 2 insertions, 7 deletions
diff --git a/Configure b/Configure
index 8052643155..66541ad1d5 100755
--- a/Configure
+++ b/Configure
@@ -1713,7 +1713,6 @@ if ($builder eq "unified") {
my @libraries = ();
my @engines = ();
my @scripts = ();
- my @extra = ();
my @intermediates = ();
my %attributes = ();
@@ -1867,9 +1866,6 @@ if ($builder eq "unified") {
push @scripts, @s;
}
},
- qr/^\s*EXTRA\s*=\s*(.*)\s*$/
- => sub { push @extra, tokenize($1)
- if !@skip || $skip[$#skip] > 0 },
qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/,
=> sub { push @{$ordinals{$1}}, tokenize($2)
@@ -1930,8 +1926,7 @@ EOF
my %infos = ( programs => [ @programs ],
libraries => [ @libraries ],
engines => [ @engines ],
- scripts => [ @scripts ],
- extra => [ @extra ] );
+ scripts => [ @scripts ] );
foreach my $k (keys %infos) {
foreach (@{$infos{$k}}) {
my $item = cleanfile($buildd, $_, $blddir);
@@ -2234,7 +2229,7 @@ EOF
### Make unified_info a bit more efficient
# One level structures
- foreach (("programs", "libraries", "modules", "scripts", "extra")) {
+ foreach (("programs", "libraries", "engines", "scripts")) {
$unified_info{$_} = [ sort keys %{$unified_info{$_}} ];
}
# Two level structures