diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-24 15:11:29 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-11-06 22:55:55 +0100 |
| commit | 51d8e5ea866a7d606e4f2aa5e45c2f7df2270ace (patch) | |
| tree | 08d207549f64c18d097501cd1be92e500b41d8d6 | |
| parent | f02ec65590ef38444e80f595ebdbd211a25b4738 (diff) | |
Windows: use default ZLIB1 unless --with-zlib-lib is set
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
(cherry picked from commit 475592e2419c5cb3098dfea4c9229d0c09ea7010)
| -rw-r--r-- | Configurations/00-base-templates.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 566b89b835..3455b3ace8 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -80,10 +80,11 @@ sub { unless ($disabled{zlib}) { if (defined($disabled{"zlib-dynamic"})) { - return $withargs{zlib_lib}; + return $withargs{zlib_lib} // "ZLIB1"; } } - return (); }, + return (); + }, ld => "link", lflags => "/nologo", |