From: Tanzinul Islam <tanzinul.islam@gmail.com>
Date: Sat, 28 Nov 2020 22:56:53 +0000 (+0000)
Subject: Ensure cw32mt.lib and import32.lib are linked to in no-sock mode
X-Git-Tag: openssl-3.0.0-alpha15~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4f4cb14e3f06362c2ee9e0e480b816ab46f15b6;p=thirdparty%2Fopenssl.git

Ensure cw32mt.lib and import32.lib are linked to in no-sock mode

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)
---

diff --git a/Configurations/50-cppbuilder.conf b/Configurations/50-cppbuilder.conf
index 7643f6b5107..334672e1a3c 100644
--- a/Configurations/50-cppbuilder.conf
+++ b/Configurations/50-cppbuilder.conf
@@ -25,9 +25,8 @@ my %targets = (
         ldpostoutflag    => ",,",
         ld_resp_delim    => " +\n",
         ex_libs          => add(sub {
-            my @ex_libs = ();
-            push @ex_libs, ("cw32mt.lib", "import32.lib", "crypt32.lib",
-                            "ws2_32.lib") unless $disabled{sock};
+            my @ex_libs = ("cw32mt.lib", "import32.lib");
+            push @ex_libs, ("crypt32.lib", "ws2_32.lib") unless $disabled{sock};
             return join(" ", @ex_libs);
         }),
         AR               => "tlib",