From: Andy Polyakov <appro@openssl.org>
Date: Mon, 24 Feb 2014 15:42:40 +0000 (+0100)
Subject: BC-32.pl: refresh Borland C support.
X-Git-Tag: OpenSSL_1_0_0m~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4ba2edd2a5634ff1f64cc0829024c3c6e796cff2;p=oweals%2Fopenssl.git

BC-32.pl: refresh Borland C support.

PR: 3251
Suggested by: Thorsten Schöning
(cherry picked from commit 779c51c6446f384c2f2a7bd5cc4c3e0366baf628)
---

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 1f1e13fb40..ed28e65e66 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -38,7 +38,7 @@ $efile="";
 $exep='.exe';
 if ($no_sock)
 	{ $ex_libs=""; }
-else	{ $ex_libs="cw32mt.lib import32.lib"; }
+else	{ $ex_libs="cw32mt.lib import32.lib crypt32.lib ws2_32.lib"; }
 
 # static library stuff
 $mklib='tlib /P64';
@@ -51,8 +51,8 @@ $lfile='';
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
-$asm='nasmw -f obj -d__omf__';
-$asm.=" /Zi" if $debug;
+$asm=(`nasm -v 2>NUL` ge `nasmw -v 2>NUL`?"nasm":"nasmw")." -f obj -d__omf__";
+$asm.=" -g" if $debug;
 $afile='-o';
 
 $bn_mulw_obj='';