From aaf286ec5e79aafdbf527b87f1f857dc2e023d2a Mon Sep 17 00:00:00 2001 From: Alexey Lustin Date: Sun, 6 Oct 2019 16:27:50 +0300 Subject: [PATCH] fix find vsdevcmd.bat in VS2019Preview --- compiler/msvc.v | 2 +- make.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/msvc.v b/compiler/msvc.v index 2a66fbee28..11b062e209 100644 --- a/compiler/msvc.v +++ b/compiler/msvc.v @@ -141,7 +141,7 @@ fn find_vs() ?VsInstallation { // VSWhere is guaranteed to be installed at this location now // If its not there then end user needs to update their visual studio // installation! - res := os.exec('""%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath"') or { + res := os.exec('""%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath"') or { return error(err) } // println('res: "$res"') diff --git a/make.bat b/make.bat index 6ee3bc5e55..dba74dec52 100644 --- a/make.bat +++ b/make.bat @@ -52,7 +52,7 @@ goto :success :msvcstrap echo Attempting to build v.c with MSVC... -for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( +for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do ( set InstallDir=%%i )