diff options
| author | Steve Dower <steve.dower@python.org> | 2019-06-14 21:19:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 21:19:25 (GMT) |
| commit | 749e73065dea1cc3a6d39a830380a2c124f568c2 (patch) | |
| tree | 627cdd16741b55c2da50bf920849976bca1cad4c /Tools/msi | |
| parent | bd5798f6d4f6960fd6b49976bdf4326be77f4277 (diff) | |
| download | cpython-749e73065dea1cc3a6d39a830380a2c124f568c2.zip cpython-749e73065dea1cc3a6d39a830380a2c124f568c2.tar.gz cpython-749e73065dea1cc3a6d39a830380a2c124f568c2.tar.bz2 | |
Fix Windows release build issues (GH-14091)
* Increase timeout for PGO builds in Windows release
* Fix test step failures
* Disable MinGW step properly
* Fix embeddable distro name
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/dev/dev.wixproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/dev/dev.wixproj b/Tools/msi/dev/dev.wixproj index 4a56cec..c6e3bcf 100644 --- a/Tools/msi/dev/dev.wixproj +++ b/Tools/msi/dev/dev.wixproj @@ -8,7 +8,7 @@ </PropertyGroup> <Import Project="..\msi.props" /> <PropertyGroup> - <DefineConstants Condition="$(BuildForRelease)"> + <DefineConstants Condition="$(BuildForRelease) and $(SuppressMinGWLib) == ''"> $(DefineConstants); IncludeMinGWLib=1; </DefineConstants> @@ -35,7 +35,7 @@ Inputs="$(BuildPath)$(PyDllName).dll" Outputs="$(BuildPath)lib$(PyDllName).a" AfterTargets="PrepareForBuild" - Condition="$(BuildForRelease)"> + Condition="$(BuildForRelease) and $(SuppressMinGWLib) == ''"> <!-- Build libpython##.a as part of this project. This requires gendef and dlltool on the path. --> <PropertyGroup> <_DllToolOpts>-m i386 --as-flags=--32</_DllToolOpts> |