From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- build/win64/mozconfig.asan | 1 - build/win64/mozconfig.vs-latest | 3 --- build/win64/mozconfig.vs2019 | 8 -------- 3 files changed, 12 deletions(-) delete mode 100644 build/win64/mozconfig.vs-latest delete mode 100644 build/win64/mozconfig.vs2019 (limited to 'build/win64') diff --git a/build/win64/mozconfig.asan b/build/win64/mozconfig.asan index 8aa1810b78..a8661a8661 100644 --- a/build/win64/mozconfig.asan +++ b/build/win64/mozconfig.asan @@ -20,4 +20,3 @@ ac_add_options --disable-crashreporter ac_add_options --disable-profiling . "$topsrcdir/build/mozconfig.clang-cl" -. "$topsrcdir/build/mozconfig.lld-link" diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest deleted file mode 100644 index 4caed70ae7..0000000000 --- a/build/win64/mozconfig.vs-latest +++ /dev/null @@ -1,3 +0,0 @@ -. $topsrcdir/build/win64/mozconfig.vs2019 -. "$topsrcdir/build/mozconfig.clang-cl" -. "$topsrcdir/build/mozconfig.lld-link" diff --git a/build/win64/mozconfig.vs2019 b/build/win64/mozconfig.vs2019 deleted file mode 100644 index e0d5da8203..0000000000 --- a/build/win64/mozconfig.vs2019 +++ /dev/null @@ -1,8 +0,0 @@ -if [ -z "${VSPATH}" ]; then - VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs" -fi - -if [ -d "${VSPATH}" ]; then - export WIN32_REDIST_DIR=${VSPATH}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT - export WINSYSROOT="${VSPATH}" -fi -- cgit v1.2.3