[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4.

[zach.ware]

https://hg.python.org/cpython/rev/76ed5454b09d
changeset:   95512:76ed5454b09d
parent:      95509:4e40fafc95e3
parent:      95511:f0e2caad4200
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Apr 09 20:20:55 2015 -0500
summary:
  Merge with 3.4.

The fix has moved in this branch.  Also, the opt-in is already available
on this branch; just set nasmDir when building.

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


diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props
--- a/PCbuild/openssl.props
+++ b/PCbuild/openssl.props
@@ -65,7 +65,7 @@
 
   <Target Name="BuildNasmFiles" BeforeTargets="PreBuildEvent" DependsOnTargets="PrepareForBuild;FindNasm" Inputs="@(NasmCompile)" Outputs="@(NasmCompile->'$(IntDir)%(Filename).obj')">
     <Exec Command='setlocal
-set PATH=%PATH%;$(nasmDir)
+set PATH=$(nasmDir);%PATH%
 $(nasm) -o "$(IntDir)%(NasmCompile.Filename).obj" "%(NasmCompile.FullPath)"' />
     <ItemGroup>
       <Link Include="$(IntDir)%(NasmCompile.Filename).obj" />

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