diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-01-22 15:46:54 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-22 16:12:47 +0100 |
| commit | 5cae2d349b561a84dbfc93d6b6abc5fb7263fb7c (patch) | |
| tree | 2aa01d7308758cd2ff0c26aecaf8e5cad3662708 /Configurations/platform | |
| parent | 13234dd310511ed2ae1832bb643dd298ddfefb0b (diff) | |
Build: change remaining $unified_info{install} checks to use attributes
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8063)
Diffstat (limited to 'Configurations/platform')
| -rw-r--r-- | Configurations/platform/Unix.pm | 4 | ||||
| -rw-r--r-- | Configurations/platform/VMS.pm | 4 | ||||
| -rw-r--r-- | Configurations/platform/Windows.pm | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/Configurations/platform/Unix.pm b/Configurations/platform/Unix.pm index 7f69cacdd4..ca8d6bb65b 100644 --- a/Configurations/platform/Unix.pm +++ b/Configurations/platform/Unix.pm @@ -44,9 +44,7 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname - unless ( grep { platform::BASE->staticname($_) eq $in_libname } - @{$unified_info{install}->{libraries}} ); + return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; # We currently return the same name anyway... but we might choose to # append '_static' or '_a' some time in the future. diff --git a/Configurations/platform/VMS.pm b/Configurations/platform/VMS.pm index 03e57e3ddb..7aeb20bb3b 100644 --- a/Configurations/platform/VMS.pm +++ b/Configurations/platform/VMS.pm @@ -39,9 +39,7 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname - unless ( grep { platform::BASE->staticname($_) eq $in_libname } - @{$unified_info{install}->{libraries}} ); + return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; return platform::BASE::__concat($_[0]->osslprefix(), platform::BASE->staticname($_[1]), diff --git a/Configurations/platform/Windows.pm b/Configurations/platform/Windows.pm index 3e13f6e86f..d1932a9200 100644 --- a/Configurations/platform/Windows.pm +++ b/Configurations/platform/Windows.pm @@ -30,9 +30,7 @@ sub staticname { # Non-installed libraries are *always* static, and their names remain # the same, except for the mandatory extension my $in_libname = platform::BASE->staticname($_[1]); - return $in_libname - unless ( grep { platform::BASE->staticname($_) eq $in_libname } - @{$unified_info{install}->{libraries}} ); + return $in_libname if $unified_info{attributes}->{$_[1]}->{noinst}; # To make sure not to clash with an import library, we make the static # variant of our installed libraries get '_static' added to their names. |