diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-24 15:03:57 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-11-06 22:55:48 +0100 |
| commit | f02ec65590ef38444e80f595ebdbd211a25b4738 (patch) | |
| tree | c535e1974ede2060b634b13979191fa15e0ecdd4 /Configurations | |
| parent | 294f7a746e9928ce4ba509e0e8fa181f18e24efd (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)
(cherry picked from commit 111b234c8f80371e7e31d922946cbd546491d4e8)
Diffstat (limited to 'Configurations')
| -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 99e435d40d..5c04009304 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1258,9 +1258,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 ]; }), |