From 31e22dee503eef4e929c9861b9f65eec76a0065c Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 3 Dec 2020 08:09:05 -0800 Subject: [PATCH] devops(win): fix paths to vswhere.exe in 64-bit shells (#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. --- browser_patches/firefox/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh index 936372b8a2..5d8c281e1d 100755 --- a/browser_patches/firefox/build.sh +++ b/browser_patches/firefox/build.sh @@ -31,10 +31,10 @@ elif [[ "$(uname)" == MINGW* ]]; then echo "-- building win64 build on MINGW" echo "ac_add_options --target=x86_64-pc-mingw32" > .mozconfig echo "ac_add_options --host=x86_64-pc-mingw32" >> .mozconfig - DLL_FILE=$("$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x64\**\vcruntime140.dll') + DLL_FILE=$("C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x64\**\vcruntime140.dll') else echo "-- building win32 build on MINGW" - DLL_FILE=$("$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x86\**\vcruntime140.dll') + DLL_FILE=$("C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x86\**\vcruntime140.dll') fi WIN32_REDIST_DIR=$(dirname "$DLL_FILE") if ! [[ -d $WIN32_REDIST_DIR ]]; then