From d757d86d6861b019d4d7ac2809254e80030fe640 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Wed, 8 Dec 2021 01:36:30 +0000
Subject: [PATCH] bpo-45582: Write empty pybuilddir.txt on Windows to allow
 relocatable build directories

---
 Modules/getpath.py      | 4 ++++
 PCbuild/pyproject.props | 2 +-
 PCbuild/python.vcxproj  | 6 +-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Modules/getpath.py b/Modules/getpath.py
index 4ef49a8847dd26..6a13e232ec3e88 100644
--- a/Modules/getpath.py
+++ b/Modules/getpath.py
@@ -449,6 +449,10 @@ def search_up(prefix, *landmarks, test=isfile):
             readlines(joinpath(real_executable_dir, BUILDDIR_TXT))[0],
         )
         build_prefix = joinpath(real_executable_dir, VPATH)
+    except IndexError:
+        # File exists but is empty
+        platstdlib_dir = real_executable_dir
+        build_prefix = joinpath(real_executable_dir, VPATH)
     except FileNotFoundError:
         if isfile(joinpath(real_executable_dir, BUILD_LANDMARK)):
             build_prefix = joinpath(real_executable_dir, VPATH)
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 0eaeb6b1229a26..bbcabb5cdb4058 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -73,7 +73,7 @@
       <LinkTimeCodeGeneration Condition="$(SupportPGO) and $(Configuration) == 'PGInstrument'">PGInstrument</LinkTimeCodeGeneration>
       <LinkTimeCodeGeneration Condition="$(SupportPGO) and $(Configuration) == 'PGUpdate'">PGUpdate</LinkTimeCodeGeneration>
       <AdditionalDependencies>advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions Condition="$(Configuration) != 'Debug'">/OPT:REF,NOICF /CGTHREADS:1 /PDBTHREADS:1 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="$(Configuration) != 'Debug'">/OPT:REF,NOICF %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Lib>
       <LinkTimeCodeGeneration Condition="$(Configuration) == 'Release'">true</LinkTimeCodeGeneration>
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index 0b4329dd07636d..f44513702879e5 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -148,10 +148,6 @@ $(_PGOPath)
     <WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" />
   </Target>
   <Target Name="GeneratePyBuildDirTxt" BeforeTargets="AfterBuild">
-    <PropertyGroup>
-      <_Content>$(OutDir)</_Content>
-      <_ExistingContent Condition="Exists('$(OutDir)pybuilddir.txt')">$([System.IO.File]::ReadAllText('$(OutDir)pybuilddir.txt'))</_ExistingContent>
-    </PropertyGroup>
-    <WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" />
+    <WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="" Overwrite="true" />
   </Target>
 </Project>