From e011160f3c323b0cefee33bec9c7a224a730fe67 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 13 Sep 2010 16:29:00 +0000
Subject: [PATCH] VC-32.pl: default to nasm if neither nasm or nasmw is is
 found at the moment [from HEAD]. PR: 2338

---
 util/pl/VC-32.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index c3e29fda96..5f25fc41bf 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -138,8 +138,8 @@ else
 	}
 
 # generate symbols.pdb unconditionally
-$app_cflag.=" /Zi /Fd$tmp_def/app";
-$lib_cflag.=" /Zi /Fd$tmp_def/lib";
+$app_cflag.=" /Zi /Fd\$(TMP_D)/app";
+$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
 $lflags.=" /debug";
 
 $obj='.obj';
@@ -195,7 +195,7 @@ if ($FLAVOR =~ /WIN64A/) {
 	my $ver=`nasm -v 2>NUL`;
 	my $vew=`nasmw -v 2>NUL`;
 	# pick newest version
-	$asm=($ver gt $vew?"nasm":"nasmw")." -f win32";
+	$asm=($ver ge $vew?"nasm":"nasmw")." -f win32";
 	$asmtype="win32n";
 	$afile='-o ';
 } else {
-- 
2.25.1