support toolset

actboy168 · Jun 11, 2024 · 5631a1a · 5631a1a
1 parent d1f3e14
commit 5631a1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/compile/msvc/find_msvc.bat b/compile/msvc/find_msvc.bat
@@ -14,7 +14,8 @@ FOR /f "usebackq tokens=*" %%i in (`"%ProgramFiles%\Microsoft Visual Studio\Inst
 )
 IF "%InstallDir%" == "" echo "Can not find msvc." && exit 1
 
+CALL compile\msvc\find_toolset.bat
 CALL compile\msvc\find_winsdk.bat
 SET VSCMD_SKIP_SENDTELEMETRY=1
-CALL "%InstallDir%\Common7\Tools\vsdevcmd.bat" -arch=%ARCH% -host_arch=%ARCH% -winsdk=%WindowsSDKVersion% 1>nul
+CALL "%InstallDir%\Common7\Tools\vsdevcmd.bat" -arch=%ARCH% -host_arch=%ARCH% -winsdk=%WindowsSDKVersion% -vcvars_ver=%VCToolsVersion% 1>nul
 :QUIT
diff --git a/compile/msvc/find_toolset.bat b/compile/msvc/find_toolset.bat
@@ -0,0 +1,4 @@
+for /F %%A in ('type "%InstallDir%\VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt"') do (
+    set "VCToolsVersion=%%A"
+)
+exit /B 0