diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:16:58 -0800 |
| commit | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (patch) | |
| tree | 74845e2dbd9521d9748b9c32f1922f4123083bf3 /PCbuild/python.props | |
| parent | e3c7e835bdfc97750eb9b7fc0ad2493108c2d438 (diff) | |
| parent | 1fe806ac56f8b83694d24ab604eb695d00bc8497 (diff) | |
| download | cpython-da79bcf8ac7ae72218ab023e1ed54390bc1a3a27.tar.gz | |
Issue #29371: merge with 3.5
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 1553731d1f..dde94f733a 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -25,7 +25,6 @@ --> <ArchName Condition="'$(ArchName)' == '' and $(Platform) == 'x64'">amd64</ArchName> <ArchName Condition="'$(ArchName)' == ''">win32</ArchName> - <ArchName Condition="$(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate'">$(ArchName)-pgo</ArchName> <!-- Root directory of the repository --> <PySourcePath Condition="'$(PySourcePath)' == ''">$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)\..\))</PySourcePath> @@ -43,9 +42,9 @@ <!-- Directories of external projects. tcltk is handled in tcltk.props --> <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> - <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> + <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> - <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> + <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir> <opensslDir>$(ExternalsDir)openssl-1.0.2j\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> |