Skip to content

Commit dc2eaf8

Browse files
committed
fix: delete ninja from VS
1 parent 4ea3d12 commit dc2eaf8

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

ci/kokoro/windows/build.bat

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,29 @@
1414

1515
@echo %date% %time%
1616

17+
@echo [DEBUG] Initial PATH:
18+
@echo %PATH%
19+
@echo [DEBUG] ============================================
20+
1721
@REM Change PATH to include the google cloud CLI (formerly SDK)
1822
@set "PATH=%ProgramFiles(x86)%\Google\Cloud SDK\google-cloud-sdk\bin;%PATH%"
1923

24+
@REM The Visual Studio installation includes a ninja.exe that can conflict with
25+
@REM the version needed by vcpkg. To avoid this, we simply delete it. A
26+
@REM working version will be available via Chocolatey later in the PATH.
27+
del /q "%ProgramFiles(x86)%\Microsoft Visual Studio\%MSVC_VERSION%\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja\ninja.exe"
28+
29+
@echo [DEBUG] PATH before calling vcvars64.bat:
30+
@echo %PATH%
31+
@echo [DEBUG] ============================================
32+
2033
REM Configure the environment to use MSVC %MSVC_VERSION% and then switch to PowerShell.
2134
call "%ProgramFiles(x86)%\Microsoft Visual Studio\%MSVC_VERSION%\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
35+
36+
@echo [DEBUG] PATH after calling vcvars64.bat:
37+
@echo %PATH%
38+
@echo [DEBUG] ============================================
39+
2240
set "BAZEL_VC=%ProgramFiles(x86)%\Microsoft Visual Studio\%MSVC_VERSION%\BuildTools\VC"
2341
set "VCPKG_OVERLAY_TRIPLETS=%cd%\ci\kokoro\windows\triplets"
2442

0 commit comments

Comments
 (0)