projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
518af4e
)
NASM has recently changed name of win32 pre-compiled binary [from HEAD].
author
Andy Polyakov
<appro@openssl.org>
Thu, 3 Jan 2008 17:14:25 +0000
(17:14 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Thu, 3 Jan 2008 17:14:25 +0000
(17:14 +0000)
PR: 1627
util/pl/VC-32.pl
patch
|
blob
|
history
diff --git
a/util/pl/VC-32.pl
b/util/pl/VC-32.pl
index 3b80adfbad2ea1c773bb914524894d8d86386ba4..198289fc38031886625ae4193554bb0cf74f4abc 100644
(file)
--- a/
util/pl/VC-32.pl
+++ b/
util/pl/VC-32.pl
@@
-160,6
+160,10
@@
$lfile='/out:';
$shlib_ex_obj="";
$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
if ($nasm) {
+ my $ver=`nasm -v`;
+ my $vew=`nasmw -v`;
+ # pick newest version
+ $asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
$asm='nasmw -f win32';
$afile='-o ';
} else {