зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1925145 - Add updated Windows SDK and fix CaR builds. r=firefox-build-system-reviewers,glandium
The windows chromium-as-release (CaR) builds recently updated the minimum windows SDK version required to complete the builds. This patch adds this new sdk toolchain and also keeps it separate for just these builds. Differential Revision: https://phabricator.services.mozilla.com/D226332
This commit is contained in:
Родитель
913cffebde
Коммит
cfcd66bac9
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -336,7 +336,7 @@ win64-custom-car:
|
|||
toolchain-artifact: public/build/car_win64.tar.zst
|
||||
fetches:
|
||||
toolchain:
|
||||
- win64-vs2022
|
||||
- win64-vs2022-car
|
||||
|
||||
browsertime:
|
||||
description: "npm install browsertime node_modules"
|
||||
|
@ -508,6 +508,23 @@ nsis:
|
|||
- linux64-clang-toolchain
|
||||
- sysroot-x86_64-linux-gnu
|
||||
|
||||
win64-vs2022-car:
|
||||
description: "VS 2022 toolchain with SDK 10.0.26100.x, for CaR builds"
|
||||
attributes:
|
||||
local-toolchain: true
|
||||
treeherder:
|
||||
symbol: TW64(msvc2022-car)
|
||||
worker:
|
||||
env:
|
||||
MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE: system
|
||||
run:
|
||||
script: get_vs.py
|
||||
arguments:
|
||||
- build/vs/vs2022-car.yaml
|
||||
resources:
|
||||
- build/vs/vs2022-car.yaml
|
||||
toolchain-artifact: project/gecko/vs/vs.tar.zst
|
||||
|
||||
win64-vs2022:
|
||||
description: "VS 2022"
|
||||
attributes:
|
||||
|
|
|
@ -111,7 +111,7 @@ if [[ $(uname -o) == "Msys" ]]; then
|
|||
pushd "$WINDOWSSDKDIR"
|
||||
mkdir -p Debuggers/x64/
|
||||
popd
|
||||
mv $MOZ_FETCHES_DIR/VS/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT/* chrome_dll/system32/
|
||||
mv $MOZ_FETCHES_DIR/VS/VC/Redist/MSVC/14.40.33807/x64/Microsoft.VC143.CRT/* chrome_dll/system32/
|
||||
mv "$WINDOWSSDKDIR/App Certification Kit/"* "$WINDOWSSDKDIR"/Debuggers/x64/
|
||||
export WINDIR="$PWD/chrome_dll"
|
||||
|
||||
|
|
|
@ -8,6 +8,9 @@ fi
|
|||
if [ ! -d "${VSPATH}/${VCDIR}" ]; then
|
||||
VCDIR=VC/Tools/MSVC/14.39.33519
|
||||
fi
|
||||
if [ ! -d "${VSPATH}/${VCDIR}" ]; then
|
||||
VCDIR=VC/Tools/MSVC/14.41.34120
|
||||
fi
|
||||
SDKDIR="Windows Kits/10"
|
||||
SDK_VERSION=10.0.17134.0
|
||||
if [ ! -d "${VSPATH}/${SDKDIR}/Lib/${SDK_VERSION}" ]; then
|
||||
|
@ -16,6 +19,9 @@ fi
|
|||
if [ ! -d "${VSPATH}/${SDKDIR}/Lib/${SDK_VERSION}" ]; then
|
||||
SDK_VERSION=10.0.22621.0
|
||||
fi
|
||||
if [ ! -d "${VSPATH}/${SDKDIR}/Lib/${SDK_VERSION}" ]; then
|
||||
SDK_VERSION=10.0.26100.0
|
||||
fi
|
||||
|
||||
case "$TARGET" in
|
||||
aarch64-pc-windows-msvc)
|
||||
|
|
Загрузка…
Ссылка в новой задаче