From: Andy Polyakov <appro@openssl.org>
Date: Thu, 3 Jan 2008 17:09:56 +0000 (+0000)
Subject: NASM has recently changed name of win32 pre-compiled binary.
X-Git-Tag: OpenSSL_0_9_8k^2~593
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=82a243132723ac27a81d689722e94e05e18992a0;p=oweals%2Fopenssl.git

NASM has recently changed name of win32 pre-compiled binary.
PR: 1627
---

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';