Skip to content

Commit 4177f3e

Browse files
committed
use VC 2022 install path directly in windows32.bat since vswhere doesn't show it even when it is available
1 parent 17a479b commit 4177f3e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildscripts/kokoro/windows32.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set JAVA_HOME=
1818

1919
mkdir grpc-java-helper32
2020
cd grpc-java-helper32
21-
call "%VS140COMNTOOLS%\vsvars32.bat" || exit /b 1
21+
call "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars32.bat" || exit /b 1
2222
call "%WORKSPACE%\buildscripts\make_dependencies.bat" || exit /b 1
2323

2424
cd "%WORKSPACE%"

buildscripts/make_dependencies.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ echo on
22
@rem set PROTOBUF_VER=21.7
33
choco install -y gradle git curl pkgconfiglite
44
choco install -y openjdk --version=21.0
5+
set JAVA_HOME="c:\Program Files\OpenJDK\jdk-21"
56
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-21\bin"
6-
set JAVA_HOME=
77
set PROTOBUF_VER=22.5
88
set ABSL_VERSION=20230125.4
99

0 commit comments

Comments
 (0)