diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2014-12-13 01:15:18 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2014-12-13 01:15:18 (GMT) |
| commit | c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb (patch) | |
| tree | 44499fecaf7e99e70b9b6370116326a582337c57 /PCbuild | |
| parent | f4f1080e2e6f00b31d423185d6312bcd74261900 (diff) | |
| download | cpython-c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb.zip cpython-c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb.tar.gz cpython-c4c79a0e82ca701ad09d51eacfc4f2c57c769ceb.tar.bz2 | |
Allows nasm to be found on the system-wide path before using the version in externals.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/openssl.props | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props index f964e4c..b64c3e1 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" /> |