diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-10 01:20:55 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-10 01:20:55 (GMT) |
| commit | 6bd687e0f27e180944f7f8dbc74f820ac9377f4f (patch) | |
| tree | 67d4cf03e8784a1eefbe7f5be1b031cebee8a868 /PCbuild | |
| parent | 5056769b36901598b9eb3900a44839284e782b14 (diff) | |
| parent | 057b5300244ca6ed2473125dabad2b553563e84d (diff) | |
| download | cpython-6bd687e0f27e180944f7f8dbc74f820ac9377f4f.zip cpython-6bd687e0f27e180944f7f8dbc74f820ac9377f4f.tar.gz cpython-6bd687e0f27e180944f7f8dbc74f820ac9377f4f.tar.bz2 | |
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.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/openssl.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index 356159e..258db05 100644 --- 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" /> |