diff options
| author | Steve Dower <steve.dower@python.org> | 2021-12-08 19:25:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 19:25:58 (GMT) |
| commit | 7778116c2f573edf320bd55301137a968e4339d8 (patch) | |
| tree | dfdc3d43400f0f1f511aa0097e4d6bccfc077833 /PCbuild | |
| parent | 3cb9731b7e59b0df9a7a9ab6b7746a669958b693 (diff) | |
| download | cpython-7778116c2f573edf320bd55301137a968e4339d8.zip cpython-7778116c2f573edf320bd55301137a968e4339d8.tar.gz cpython-7778116c2f573edf320bd55301137a968e4339d8.tar.bz2 | |
bpo-46015: Fixes calculation of sys.path in a venv on Windows (GH-29992)
Also ensures that pybuilddir.txt is written early enough in the build to be picked up by later steps.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/python.vcxproj | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index f445137..77bccde 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -117,6 +117,10 @@ <Import Project="regen.targets" /> </ImportGroup> <Target Name="_TriggerPostRegen" AfterTargets="Build" DependsOnTargets="PostBuildRegen" /> + <Target Name="GeneratePyBuildDirTxt" AfterTargets="Link"> + <Message Text="Generating $(OutDir)pybuilddir.txt" /> + <WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="%0D%0A" Overwrite="true" /> + </Target> <Target Name="ValidateUcrtbase" AfterTargets="AfterBuild" Condition="$(Configuration) != 'PGInstrument' and $(Platform) != 'ARM' and $(Platform) != 'ARM64'"> <PropertyGroup> <UcrtName>ucrtbase</UcrtName> @@ -147,7 +151,4 @@ $(_PGOPath) </PropertyGroup> <WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" /> </Target> - <Target Name="GeneratePyBuildDirTxt" BeforeTargets="AfterBuild"> - <WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="" Overwrite="true" /> - </Target> </Project> |