traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Zachary Ware 2015-04-09 20:20:55 -05:00
parent 5056769b36 057b530024
commit 6bd687e0f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PCbuild/openssl.props
View File

@ -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" />