From f159b83a75c8d5e5c43ae4b2dec62086a5e36189 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 8 Jul 2021 19:05:34 +0200 Subject: [PATCH] Configurations/unix-Makefile.tmpl: use platform->sharedlib() as fallback If platform->sharedlib_simple() and platform->sharedlib_import() return undefined, try platform->sharedlib() as a fallback before platform->staticlib(). Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/16023) --- Configurations/unix-Makefile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index b82166f70a..0fb80f1968 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1392,7 +1392,7 @@ FORCE: # Building targets ################################################### -libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // () } @{$unified_info{libraries}}) -} +libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -} libcrypto.pc: @ ( echo 'prefix=$(INSTALLTOP)'; \ echo 'exec_prefix=$${prefix}'; \ @@ -1484,6 +1484,7 @@ reconfigure reconf: # On Unix platforms, we depend on {shlibname}.so return map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) + // platform->sharedlib($_) // platform->staticlib($_) } @_; } -- 2.34.1