Bug 1817372 - Use the new windows target triplets on automation. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D170170

browser/config/mozconfigs/win32/common-win32

@@ -1,6 +1,6 @@
 # This file is used by all Win32 builds
 
-ac_add_options --target=i686-pc-mingw32
+ac_add_options --target=i686-pc-windows-msvc
 
 . $topsrcdir/build/win32/mozconfig.vs-latest
 

browser/config/mozconfigs/win32/mingwclang

@@ -18,7 +18,7 @@
 export MOZ_PACKAGE_JSSHELL=1
 
 # MinGW Stuff
-ac_add_options --target=i686-w64-mingw32
+ac_add_options --target=i686-pc-windows-gnu
 ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
 
 ac_add_options --disable-warnings-as-errors

browser/config/mozconfigs/win64-aarch64/common-win64

@@ -1,6 +1,6 @@
 # This file is used by all AArch64 Win64 builds
 
-ac_add_options --target=aarch64-windows-mingw32
+ac_add_options --target=aarch64-pc-windows-msvc
 
 . $topsrcdir/build/win64-aarch64/mozconfig.vs-latest
 

browser/config/mozconfigs/win64/common-win64

@@ -1,6 +1,6 @@
 # This file is used by all Win64 builds
 
-ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-windows-msvc
 
 . $topsrcdir/build/win64/mozconfig.vs-latest
 

browser/config/mozconfigs/win64/mingwclang

@@ -18,7 +18,7 @@
 export MOZ_PACKAGE_JSSHELL=1
 
 # MinGW Stuff
-ac_add_options --target=x86_64-w64-mingw32
+ac_add_options --target=x86_64-pc-windows-gnu
 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-
 
 ac_add_options --disable-warnings-as-errors

browser/config/mozconfigs/win64/plain-opt

@@ -1,4 +1,4 @@
 ac_add_options --disable-release
-ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-windows-msvc
 
 . $topsrcdir/build/win64/mozconfig.vs-latest

build/win32/mozconfig.vs2017

@@ -8,4 +8,4 @@ if [ -d "${VSPATH}" ]; then
     export WINSYSROOT="${VSPATH}"
 fi
 
-ac_add_options --target=i686-pc-mingw32
+ac_add_options --target=i686-pc-windows-msvc

js/src/devtools/automation/autospider.py

@@ -314,7 +314,7 @@ if platform.system() == "Windows":
 # Configure flags, based on word length and cross-compilation
 if word_bits == 32:
     if platform.system() == "Windows":
-        CONFIGURE_ARGS += " --target=i686-pc-mingw32"
+        CONFIGURE_ARGS += " --target=i686-pc-windows-msvc"
     elif platform.system() == "Linux":
         if not platform.machine().startswith("arm"):
             CONFIGURE_ARGS += " --target=i686-pc-linux"
@@ -329,7 +329,7 @@ if word_bits == 32:
         env["CXXFLAGS"] = "{0} {1}".format(env.get("CXXFLAGS", ""), sse_flags)
 else:
     if platform.system() == "Windows":
-        CONFIGURE_ARGS += " --target=x86_64-pc-mingw32"
+        CONFIGURE_ARGS += " --target=x86_64-pc-windows-msvc"
 
 if platform.system() == "Linux" and AUTOMATION:
     CONFIGURE_ARGS = "--enable-stdcxx-compat " + CONFIGURE_ARGS

tools/rusttests/config/mozconfigs/win32/rusttests

@@ -1,3 +1,3 @@
-ac_add_options --target=i686-pc-mingw32
+ac_add_options --target=i686-pc-windows-msvc
 . "$topsrcdir/build/win32/mozconfig.vs-latest"
 . "$topsrcdir/tools/rusttests/config/mozconfigs/windows-common"

tools/rusttests/config/mozconfigs/win64/rusttests

@@ -1,3 +1,3 @@
-ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-windows-msvc
 . "$topsrcdir/build/win64/mozconfig.vs-latest"
 . "$topsrcdir/tools/rusttests/config/mozconfigs/windows-common"