Configurations/unix-Makefile.tmpl: use platform->sharedlib() as fallback
authorRichard Levitte <levitte@openssl.org>
Thu, 8 Jul 2021 17:05:34 +0000 (19:05 +0200)
committerRichard Levitte <levitte@openssl.org>
Sat, 10 Jul 2021 10:09:11 +0000 (12:09 +0200)
If platform->sharedlib_simple() and platform->sharedlib_import()
return undefined, try platform->sharedlib() as a fallback before
platform->staticlib().

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16023)

Configurations/unix-Makefile.tmpl

index b82166f70ae65eadf24f0cd82d980135f136cb4f..0fb80f1968657c21b610b7d14138516016db779c 100644 (file)
@@ -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($_)
                  } @_;
   }