diff options
| author | neonene <53406459+neonene@users.noreply.github.com> | 2021-12-10 17:13:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 17:13:55 (GMT) |
| commit | 3f398a77d37b5dfd51dabbc362d482a482fa885a (patch) | |
| tree | 9ab6ad057291bc7ce12f9cf0286bd49556d5e407 /PCbuild/python.props | |
| parent | 036bbb1d1b6156a1a72c40e9f907f302505085bc (diff) | |
| download | cpython-3f398a77d37b5dfd51dabbc362d482a482fa885a.zip cpython-3f398a77d37b5dfd51dabbc362d482a482fa885a.tar.gz cpython-3f398a77d37b5dfd51dabbc362d482a482fa885a.tar.bz2 | |
bpo-45582: Fix test_embed failure during a PGO build on Windows (GH-30014)
This defines VPATH differently in PGO instrumentation builds, to account for a different default output directory. It also adds sys._vpath on Windows to make the value available to sysconfig so that it can be used in tests.
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 7b85ad1..ce86076 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -53,6 +53,10 @@ <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath> + <!-- VPATH definition (escaped) --> + <PyVPath Condition="$(Configuration) != 'PGInstrument'">..\\..</PyVPath> + <PyVPath Condition="$(Configuration) == 'PGInstrument'">..\\..\\..</PyVPath> + <!-- Directories of external projects. tcltk is handled in tcltk.props --> <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir> <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir> |