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
dothq · Mar 5, 2020 · 122dd3b · 122dd3b
1 parent e71aed1
commit 122dd3b
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		ac_add_options --target=x86_64-pc-mingw32

		. $topsrcdir/build/win64/mozconfig.vs-latest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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"