From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/config/mozconfigs/win64/common-win64 | 2 +- browser/config/mozconfigs/win64/mingwclang | 2 +- browser/config/mozconfigs/win64/plain-opt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'browser/config/mozconfigs/win64') diff --git a/browser/config/mozconfigs/win64/common-win64 b/browser/config/mozconfigs/win64/common-win64 index 3a61c84141..e03d6c28b9 100644 --- a/browser/config/mozconfigs/win64/common-win64 +++ b/browser/config/mozconfigs/win64/common-win64 @@ -2,7 +2,7 @@ ac_add_options --target=x86_64-pc-windows-msvc -. $topsrcdir/build/win64/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl if test `uname -s` = Linux; then diff --git a/browser/config/mozconfigs/win64/mingwclang b/browser/config/mozconfigs/win64/mingwclang index d80e4a7654..a99f6f5be0 100644 --- a/browser/config/mozconfigs/win64/mingwclang +++ b/browser/config/mozconfigs/win64/mingwclang @@ -32,7 +32,7 @@ ac_add_options --enable-disk-remnant-avoidance ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-geckodriver # Bug 1489320 ac_add_options --disable-update-agent # Bug 1561797 -ac_add_options --disable-default-browser-agent # WinToast does not build on mingw +ac_add_options --disable-default-browser-agent # Relies on toast notifications which don't build on mingw. ac_add_options --disable-notification-server # Toast notifications don't build on mingw. # Find our toolchain diff --git a/browser/config/mozconfigs/win64/plain-opt b/browser/config/mozconfigs/win64/plain-opt index f0eac8a02a..0e17d6da59 100644 --- a/browser/config/mozconfigs/win64/plain-opt +++ b/browser/config/mozconfigs/win64/plain-opt @@ -1,4 +1,4 @@ ac_add_options --disable-release ac_add_options --target=x86_64-pc-windows-msvc -. $topsrcdir/build/win64/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl -- cgit v1.2.3