From 4279fcbbfe768c2aab95f1f01e43e520531b9795 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 31 Mar 2022 10:32:29 -0600 Subject: 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 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18006) (cherry picked from commit b83c0a900f9303e0c9fd084829b791386d7c57ce) --- Configurations/platform/AIX.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Configurations') 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'); } -- cgit v1.2.3