diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-24 15:03:57 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-06 22:54:08 +0100 |
| commit | 111b234c8f80371e7e31d922946cbd546491d4e8 (patch) | |
| tree | fdc1f2e49f78ccce1a544e98f5fe288b58816dc5 | |
| parent | 1186a2b3d40e33cbf42d4fd3c7cc679f9f6e14f2 (diff) | |
Fix the LIBZ macro on VC config targets
If zlib-dynamic was given but not --with-zlib-lib, LIBZ was defined to
the empty string. Instead, give it the default "ZLIB1".
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
| -rw-r--r-- | Configurations/10-main.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 5d11d3f628..dd5085dba9 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1277,9 +1277,11 @@ sub vms_info { cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", defines => add(sub { my @defs = (); unless ($disabled{"zlib-dynamic"}) { + my $zlib = + $withargs{zlib_lib} // "ZLIB1"; push @defs, quotify("perl", - 'LIBZ="' . $withargs{zlib_lib} . '"'); + 'LIBZ="' . $zlib . '"'); } return [ @defs ]; }), |