Skip to content

Commit fb8d481

Browse files
authored
Use vswhere to find the lib.exe path (#170)
1 parent bf10b83 commit fb8d481

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

.taskcluster.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,14 @@ tasks:
9797
payload:
9898
maxRunTime: 3600
9999
command:
100-
- set VS_PATH=%programfiles(x86)%\Microsoft Visual Studio 14.0\VC
100+
- set VSWHERE=%programfiles(x86)%\Microsoft Visual Studio\Installer
101+
- set VS_BINS=VC\Tools\MSVC\*\bin\Hostx64\x64
101102
- set RUSTUP_INIT_PATH=%CD%\rustup-init
102-
- set PATH=%RUSTUP_INIT_PATH%;%USERPROFILE%\.cargo\bin;%PATH%
103-
- call "%VS_PATH%\vcvarsall.bat" x86_amd64
103+
- set CARGO_PATH=%USERPROFILE%\.cargo\bin
104+
- set PATH=%RUSTUP_INIT_PATH%;%CARGO_PATH%;%VSWHERE%;%PATH%
105+
- set VSWHERE_CMD=vswhere -latest -products * -find %VS_BINS%
106+
- FOR /F "tokens=*" %%o IN ('%VSWHERE_CMD%') do (SET LIB_PATH=%%o)
107+
- set PATH=%LIB_PATH%;%PATH%
104108
- rustup-init -yv --default-toolchain stable ^
105109
--default-host x86_64-pc-windows-msvc
106110
- git clone --recursive --quiet ${repository}

0 commit comments

Comments
 (0)