Skip to content

Commit b0b3086

Browse files
authored
bpo-45582: Write empty pybuilddir.txt on Windows to allow relocatable build directories (GH-29979)
1 parent 32a6724 commit b0b3086

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Modules/getpath.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,10 @@ def search_up(prefix, *landmarks, test=isfile):
449449
readlines(joinpath(real_executable_dir, BUILDDIR_TXT))[0],
450450
)
451451
build_prefix = joinpath(real_executable_dir, VPATH)
452+
except IndexError:
453+
# File exists but is empty
454+
platstdlib_dir = real_executable_dir
455+
build_prefix = joinpath(real_executable_dir, VPATH)
452456
except FileNotFoundError:
453457
if isfile(joinpath(real_executable_dir, BUILD_LANDMARK)):
454458
build_prefix = joinpath(real_executable_dir, VPATH)

PCbuild/pyproject.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<LinkTimeCodeGeneration Condition="$(SupportPGO) and $(Configuration) == 'PGInstrument'">PGInstrument</LinkTimeCodeGeneration>
7474
<LinkTimeCodeGeneration Condition="$(SupportPGO) and $(Configuration) == 'PGUpdate'">PGUpdate</LinkTimeCodeGeneration>
7575
<AdditionalDependencies>advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
76-
<AdditionalOptions Condition="$(Configuration) != 'Debug'">/OPT:REF,NOICF /CGTHREADS:1 /PDBTHREADS:1 %(AdditionalOptions)</AdditionalOptions>
76+
<AdditionalOptions Condition="$(Configuration) != 'Debug'">/OPT:REF,NOICF %(AdditionalOptions)</AdditionalOptions>
7777
</Link>
7878
<Lib>
7979
<LinkTimeCodeGeneration Condition="$(Configuration) == 'Release'">true</LinkTimeCodeGeneration>

PCbuild/python.vcxproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,6 @@ $(_PGOPath)
148148
<WriteLinesToFile File="$(PySourcePath)python.bat" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" />
149149
</Target>
150150
<Target Name="GeneratePyBuildDirTxt" BeforeTargets="AfterBuild">
151-
<PropertyGroup>
152-
<_Content>$(OutDir)</_Content>
153-
<_ExistingContent Condition="Exists('$(OutDir)pybuilddir.txt')">$([System.IO.File]::ReadAllText('$(OutDir)pybuilddir.txt'))</_ExistingContent>
154-
</PropertyGroup>
155-
<WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="$(_Content)" Overwrite="true" Condition="'$(_Content)' != '$(_ExistingContent)'" />
151+
<WriteLinesToFile File="$(OutDir)pybuilddir.txt" Lines="" Overwrite="true" />
156152
</Target>
157153
</Project>

0 commit comments

Comments
 (0)