diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-10-25 15:55:15 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-10-25 16:09:01 +0200 |
| commit | b3023ced6b6a4aece6f4d4ec1f6a93b1c03712b6 (patch) | |
| tree | 8463c4dcd981aa83dfea897fbd30dcc3980e4eb3 /test | |
| parent | f81b043ad856d8b9af5239a4978f8bd4b965dab9 (diff) | |
Windows: Produce a static version of the public libraries, always
When building shared libraries on Windows, we had a clash between
'libcrypto.lib' the static routine library and 'libcrypto.lib' the
import library.
We now change it so the static versions of our libraries get '_static'
appended to their names. These will never get installed, but can
still be used for our internal purposes, such as internal tests.
When building non-shared, the renaming mechanism doesn't come into
play. In that case, the static libraries 'libcrypto.lib' and
'libssl.lib' are installed, just as always.
Fixes #7492
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7496)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/build.info b/test/build.info index a6b7ac5af1..4d3ea5d059 100644 --- a/test/build.info +++ b/test/build.info @@ -436,10 +436,8 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=main # available through the shared library (at least on Linux, Solaris, Windows # and VMS, where the exported symbols are those listed in util/*.num), these # programs are forcibly linked with the static libraries, where all symbols - # are always available. This excludes linking these programs natively on - # Windows when building shared libraries, since the static libraries share - # names with the DLL import libraries. - IF[{- $disabled{shared} || $target{build_scheme}->[1] ne 'windows' -}] + # are always available. + IF[1] PROGRAMS_NO_INST=asn1_internal_test modes_internal_test x509_internal_test \ tls13encryptiontest wpackettest ctype_internal_test \ rdrand_sanitytest |