File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -96,9 +96,8 @@ if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" (
96
96
)
97
97
)
98
98
99
- if not exist " %GIT% " where git > " %TEMP% \git.loc " 2 > nul && set /P GIT = < " %TEMP% \ git.loc " & del " %TEMP% \git.loc "
99
+ if " %GIT% " EQU " " set GIT = git
100
100
if exist " %GIT% " set GITProperty = /p:GIT=" %GIT% "
101
- if not exist " %GIT% " echo Cannot find Git on PATH & set GITProperty =
102
101
103
102
rem Setup the environment
104
103
call " %dir% find_msbuild.bat" %MSBUILD%
Original file line number Diff line number Diff line change 26
26
@ set MSBUILD =
27
27
28
28
@ rem If msbuild.exe is on the PATH, assume that the user wants that one.
29
- @ where msbuild > " %TEMP% \msbuild.loc " 2 > nul && set /P MSBUILD = < " %TEMP% \msbuild.loc " & del " %TEMP% \msbuild.loc "
30
- @ if exist " %MSBUILD% " set MSBUILD = " %MSBUILD% " & (set _Py_MSBuild_Source=PATH) & goto :found
29
+ @ msbuild /version > nul 2 >& 1
30
+ @ if NOT ERRORLEVEL 9009 set MSBUILD = msbuild & (set _Py_MSBuild_Source=PATH) & goto :found
31
31
32
32
@ rem VS 2015 and earlier register MSBuild separately, so we can find it.
33
33
@ rem Prefer MSBuild 14.0 over MSBuild 15.0, since the latter may not be able to find a VC14 install.
You can’t perform that action at this time.
0 commit comments