From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 13 Dec 2014 01:15:18 +0000 (-0800)
Subject: Allows nasm to be found on the system-wide path before using the version in externals.
X-Git-Tag: v3.5.0a1~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb;p=python

Allows nasm to be found on the system-wide path before using the version in externals.
---

diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
index f964e4cae6..b64c3e1ebd 100644
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -52,13 +52,15 @@
   
   <Target Name="FindNasm">
     <PropertyGroup>
-      <nasm Condition="$(Platform) == 'Win32'">"$(nasmDir)nasm.exe" -f win32</nasm>
-      <nasm Condition="$(Platform) == 'x64'">"$(nasmDir)nasm.exe" -f win64 -DNEAR -Ox -g</nasm>
+      <nasm Condition="$(Platform) == 'Win32'">nasm.exe -f win32</nasm>
+      <nasm Condition="$(Platform) == 'x64'">nasm.exe -f win64 -DNEAR -Ox -g</nasm>
     </PropertyGroup>
   </Target>
 
   <Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')">
-    <Exec Command='$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
+    <Exec Command='setlocal
+set PATH=%PATH%;$(nasmDir)
+$(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
     <ItemGroup>
       <Link Include="$(IntDir)%(NasmCompile.Filename).obj" />
       <Lib Include="$(IntDir)%(NasmCompile.Filename).obj" />