Skip to content

Commit 31e22de

Browse files
authored
devops(win): fix paths to vswhere.exe in 64-bit shells (microsoft#4577)
The `$PROGRAMFILES` variable is defined per the bitness of the application: 32-bit shells get `C:\Program Files (x86)`, whereas 64-bit shells get `C:\Program Files`. Visual Studio, however, has only 32-bit build and is always located in the `C:\Program Files (x86)` folder. This patch fixes `//browser_patches/firefox/build.sh` on 64-bit windows shell.
1 parent 3d6194e commit 31e22de

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

browser_patches/firefox/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ elif [[ "$(uname)" == MINGW* ]]; then
3131
echo "-- building win64 build on MINGW"
3232
echo "ac_add_options --target=x86_64-pc-mingw32" > .mozconfig
3333
echo "ac_add_options --host=x86_64-pc-mingw32" >> .mozconfig
34-
DLL_FILE=$("$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x64\**\vcruntime140.dll')
34+
DLL_FILE=$("C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x64\**\vcruntime140.dll')
3535
else
3636
echo "-- building win32 build on MINGW"
37-
DLL_FILE=$("$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x86\**\vcruntime140.dll')
37+
DLL_FILE=$("C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x86\**\vcruntime140.dll')
3838
fi
3939
WIN32_REDIST_DIR=$(dirname "$DLL_FILE")
4040
if ! [[ -d $WIN32_REDIST_DIR ]]; then

0 commit comments

Comments
 (0)