diff options
author | Richard Levitte <levitte@openssl.org> | 2021-01-15 12:20:25 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-01-21 19:48:33 +0100 |
commit | ef161e7b8f61ea588c654c9600bde80b2e07588f (patch) | |
tree | 3e17c43e22d987c44b9035345b21a6e537caeada /Configurations/platform | |
parent | daa86f9e6bfeb83a5db976c6351f7a568a8d6dcb (diff) |
Unix Makefile generator: separate "simple" shared libraries from import libraries
For Unix like environments, we may have so called "simple" shared
library names (libfoo.so as opposed to libfoo.so.1.2), or we may have
"import" library names associated with a DLL (libfoo.dll.a for
libfoo.dll on Mingw and derivatives).
So far, "import" library names were treated the same as "simple"
shared library names, as some kind of normalization for the Unix way
of doing things.
We now shift to treat them separately, to make it clearer what is
what.
Fixes #13414, incidently
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13875)
Diffstat (limited to 'Configurations/platform')
-rw-r--r-- | Configurations/platform/Unix.pm | 4 | ||||
-rw-r--r-- | Configurations/platform/mingw.pm | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Configurations/platform/Unix.pm b/Configurations/platform/Unix.pm index bb93d38f8c..f05ff67ad2 100644 --- a/Configurations/platform/Unix.pm +++ b/Configurations/platform/Unix.pm @@ -66,4 +66,8 @@ sub sharedlib_simple { $_[0]->shlibextsimple()); } +sub sharedlib_import { + return undef; +} + 1; diff --git a/Configurations/platform/mingw.pm b/Configurations/platform/mingw.pm index 7dacb32a31..d525ae8e57 100644 --- a/Configurations/platform/mingw.pm +++ b/Configurations/platform/mingw.pm @@ -37,10 +37,13 @@ sub sharedname { ? "-x64" : "")); } -# With Mingw and other DLL producers, there isn't really any "simpler" -# shared library name. However, there is a static import library, so -# we return that instead. +# With Mingw and other DLL producers, there isn't any "simpler" shared +# library name. However, there is a static import library. sub sharedlib_simple { + return undef; +} + +sub sharedlib_import { return platform::BASE::__concat(platform::BASE->sharedname($_[1]), $_[0]->shlibextimport()); } |