diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-12-04 16:31:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-12-12 17:18:07 +0100 |
| commit | 8dd0ff1c55972241040a8570b85632058c80b9ef (patch) | |
| tree | 170ad38bb1c6715d0977f420313160c93ac4e1a0 /Configurations/common.tmpl | |
| parent | 7a061312038ce909a214edc4e21c8981c77bc650 (diff) | |
Configure et al: cleanups
Remove some config attributes that just duplicate values that are
already there in other attributes.
Remove the special runs of mkdef.pl and mkrc.pl from build file
templates, as these are now done via GENERATE statements in
build.info.
Remove all references to ordinal files from build file templates, as
these are now treated via the GENERATE statements in build.info.
Also remove -shared flags and similar that are there in shared-info.pl
anyway. (in the case of darwin, it's mandatory, as -bundle and
-dynamiclib don't mix)
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4840)
Diffstat (limited to 'Configurations/common.tmpl')
| -rw-r--r-- | Configurations/common.tmpl | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index 79e1746d2d..b9937bd434 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -123,16 +123,12 @@ my $lib = shift; return "" if $cache{$lib}; unless ($disabled{shared} || $lib =~ /\.a$/) { - my %ordinals = - $unified_info{ordinals}->{$lib} - ? (ordinals => $unified_info{ordinals}->{$lib}) : (); $OUT .= libobj2shlib(shlib => $unified_info{sharednames}->{$lib}, lib => $lib, objs => [ @{$unified_info{shared_sources}->{$lib}}, @{$unified_info{sources}->{$lib}} ], deps => [ reducedepends(resolvedepends($lib)) ], - installed => is_installed($lib), - %ordinals); + installed => is_installed($lib)); foreach ((@{$unified_info{shared_sources}->{$lib}}, @{$unified_info{sources}->{$lib}})) { # If this is somehow a compiled object, take care of it that way |