diff options
| author | Andy Polyakov <appro@openssl.org> | 2008-01-03 17:09:56 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2008-01-03 17:09:56 +0000 |
| commit | 82a243132723ac27a81d689722e94e05e18992a0 (patch) | |
| tree | 46392f72dcd82acf202d9170e15a6dd077e4f3d7 /util | |
| parent | 96fc37f1458fb0a612c2a51978bd6548d4567685 (diff) | |
NASM has recently changed name of win32 pre-compiled binary.
PR: 1627
Diffstat (limited to 'util')
| -rw-r--r-- | util/pl/VC-32.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index dfde1aa2b1..f335a0ac05 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -163,7 +163,10 @@ $lfile='/out:'; $shlib_ex_obj=""; $app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/); if ($nasm) { - $asm='nasmw -f win32'; + my $ver=`nasm -v`; + my $vew=`nasmw -v`; + # pick newest version + $asm=($ver gt $vew?"nasm":"nasmw")." -f win32"; $afile='-o '; } else { $asm='ml /Cp /coff /c /Cx'; |