[Python-checkins] cpython: Allows nasm to be found on the system-wide path before using the version in

[steve.dower]

https://hg.python.org/cpython/rev/e301ef500178
changeset:   93864:e301ef500178
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri Dec 12 17:15:18 2014 -0800
summary:
  Allows nasm to be found on the system-wide path before using the version in externals.

files:
  PCbuild/openssl.props |  8 +++++---
  1 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
--- 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" />

-- 
Repository URL: https://hg.python.org/cpython