diff options
| author | Todd C. Miller <Todd.Miller@sudo.ws> | 2022-03-31 10:32:29 -0600 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-04-05 09:45:03 +0200 |
| commit | 4279fcbbfe768c2aab95f1f01e43e520531b9795 (patch) | |
| tree | 5fbb4fd951fe77736efdf6b7e31797b32d64acf7 /Configurations | |
| parent | 3954b189362b6482d4084a2f8a4f8ff60b2022c8 (diff) | |
Fix AIX build when no-shared is passed to Configure.
AIX shared libs are also .a files so the AIX platform staticname()
appends a '_a' to the name to avoid a collision. However, this
must not be done when no-shared is passed to Configure or the
binaries that link with -lcrypto and -lssl be unable to link as
those libraries won't exist without the '_a' suffix.
CLA: trivial
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18006)
(cherry picked from commit b83c0a900f9303e0c9fd084829b791386d7c57ce)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/platform/AIX.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/platform/AIX.pm b/Configurations/platform/AIX.pm index e2409057cd..c6c1437f96 100644 --- a/Configurations/platform/AIX.pm +++ b/Configurations/platform/AIX.pm @@ -25,5 +25,5 @@ sub staticname { return $in_libname if $unified_info{attributes}->{libraries}->{$_[1]}->{noinst}; - return platform::BASE->staticname($_[1]) . '_a'; + return platform::BASE->staticname($_[1]) . ($disabled{shared} ? '' : '_a'); } |