From 122dd3b2914247f22d5f044246c5fc9e76bfd3d0 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 5 Mar 2020 21:41:19 +0000 Subject: [PATCH] Bug 1620164 - Include mozconfig.vs-latest from common-win64 r=firefox-build-system-reviewers,rstewart Differential Revision: https://phabricator.services.mozilla.com/D65470 --HG-- extra : moz-landing-system : lando --- browser/config/mozconfigs/win64/code-coverage | 2 -- browser/config/mozconfigs/win64/common-opt | 2 -- browser/config/mozconfigs/win64/common-win64 | 1 + browser/config/mozconfigs/win64/debug | 2 -- browser/config/mozconfigs/win64/debug-asan | 3 +-- browser/config/mozconfigs/win64/debug-searchfox | 2 -- browser/config/mozconfigs/win64/nightly-asan | 3 +-- browser/config/mozconfigs/win64/nightly-asan-reporter | 1 + 8 files changed, 4 insertions(+), 12 deletions(-) diff --git a/browser/config/mozconfigs/win64/code-coverage b/browser/config/mozconfigs/win64/code-coverage index ea4e3bdad29f3..54c8aec261e5a 100644 --- a/browser/config/mozconfigs/win64/code-coverage +++ b/browser/config/mozconfigs/win64/code-coverage @@ -13,8 +13,6 @@ ac_add_options --enable-rust-tests # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -. $topsrcdir/build/win64/mozconfig.vs-latest - # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/common-opt b/browser/config/mozconfigs/win64/common-opt index e1468e6b2d6b2..cbdaf067b2be6 100644 --- a/browser/config/mozconfigs/win64/common-opt +++ b/browser/config/mozconfigs/win64/common-opt @@ -20,7 +20,5 @@ ac_add_options --with-mozilla-api-keyfile=${APIKEYDIR}/mozilla-desktop-geoloc-ap # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -. $topsrcdir/build/win64/mozconfig.vs-latest - # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/common-win64 b/browser/config/mozconfigs/win64/common-win64 index 8619c4b023e4f..80d38452d5833 100644 --- a/browser/config/mozconfigs/win64/common-win64 +++ b/browser/config/mozconfigs/win64/common-win64 @@ -2,3 +2,4 @@ ac_add_options --target=x86_64-pc-mingw32 +. $topsrcdir/build/win64/mozconfig.vs-latest diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug index 73efbd1d5172c..4af342c1d4f2f 100644 --- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -15,6 +15,4 @@ export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-branding=browser/branding/nightly -. $topsrcdir/build/win64/mozconfig.vs-latest - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/win64/debug-asan b/browser/config/mozconfigs/win64/debug-asan index 79088a93e03fd..23ee26f38d45c 100644 --- a/browser/config/mozconfigs/win64/debug-asan +++ b/browser/config/mozconfigs/win64/debug-asan @@ -2,12 +2,11 @@ MOZ_AUTOMATION_L10N_CHECK=0 . "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" ac_add_options --enable-debug ac_add_options --enable-optimize="-O1" -. "$topsrcdir/build/win64/mozconfig.vs-latest" - . "$topsrcdir/build/win64/mozconfig.asan" export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/debug-searchfox b/browser/config/mozconfigs/win64/debug-searchfox index de4142f5f57d9..a805b66fb7dcc 100644 --- a/browser/config/mozconfigs/win64/debug-searchfox +++ b/browser/config/mozconfigs/win64/debug-searchfox @@ -16,7 +16,5 @@ export RUSTFLAGS="-Zsave-analysis" ac_add_options --enable-clang-plugin ac_add_options --enable-mozsearch-plugin -. $topsrcdir/build/win64/mozconfig.vs-latest - . "$topsrcdir/build/mozconfig.common.override" . "$topsrcdir/build/mozconfig.clang-cl" diff --git a/browser/config/mozconfigs/win64/nightly-asan b/browser/config/mozconfigs/win64/nightly-asan index b382a66976f73..ffa593d7bcdb5 100644 --- a/browser/config/mozconfigs/win64/nightly-asan +++ b/browser/config/mozconfigs/win64/nightly-asan @@ -2,12 +2,11 @@ MOZ_AUTOMATION_L10N_CHECK=0 . "$topsrcdir/build/mozconfig.win-common" . "$topsrcdir/browser/config/mozconfigs/common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" ac_add_options --disable-debug ac_add_options --enable-optimize="-O2 -gline-tables-only" -. "$topsrcdir/build/win64/mozconfig.vs-latest" - . "$topsrcdir/build/win64/mozconfig.asan" export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/nightly-asan-reporter b/browser/config/mozconfigs/win64/nightly-asan-reporter index cc7c6c5647c6d..666cec5f2b55f 100644 --- a/browser/config/mozconfigs/win64/nightly-asan-reporter +++ b/browser/config/mozconfigs/win64/nightly-asan-reporter @@ -1,6 +1,7 @@ MOZ_AUTOMATION_L10N_CHECK=0 . "$topsrcdir/build/mozconfig.win-common" +. "$topsrcdir/browser/config/mozconfigs/win64/common-win64" . "$topsrcdir/browser/config/mozconfigs/win64/common-opt" ac_add_options --disable-debug