Ensure cw32mt.lib and import32.lib are linked to in no-sock mode
authorTanzinul Islam <tanzinul.islam@gmail.com>
Sat, 28 Nov 2020 22:56:53 +0000 (22:56 +0000)
committerDmitry Belyavskiy <beldmit@gmail.com>
Mon, 19 Apr 2021 09:05:54 +0000 (11:05 +0200)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13540)

Configurations/50-cppbuilder.conf

index 7643f6b5107fb0fb5bb471959aae1f05fe38cce0..334672e1a3c41d19bcfee70ab4c999ecff1100db 100644 (file)
@@ -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",