summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2014-02-24 16:42:40 +0100
committerAndy Polyakov <appro@openssl.org>2014-02-24 16:49:10 +0100
commit79bb00534df274d8032587075bbaad0dbd2a4964 (patch)
treea23891331e7a5466cffcdafa516fc6a0266c0078
parentc4b16ddc8f3429408f0244f6e66e9a4237f4da59 (diff)
downloadopenssl-new-79bb00534df274d8032587075bbaad0dbd2a4964.tar.gz
BC-32.pl: refresh Borland C support.
PR: 3251 Suggested by: Thorsten Schöning (cherry picked from commit 779c51c6446f384c2f2a7bd5cc4c3e0366baf628)
-rw-r--r--util/pl/BC-32.pl6
1 files changed, 3 insertions, 3 deletions
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='';