Bug 1431640: Repack win64 builds when requested to do so; r=me

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

--HG--
extra : rebase_source : 0b6b3b82e3f304e4747832e79934f9c272b7d79d
extra : amend_source : 543aac0633a2a2bc880388d7f365b03d18e1ed74
extra : histedit_source : 94df67be054a52de1d6d4ca7b6433d648aa47f76

mail/config/mozconfigs/win64/common-win64

@@ -0,0 +1,4 @@
+# This file is used by all Win64 builds
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32

mail/config/mozconfigs/win64/debug

@@ -3,9 +3,7 @@
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
+. "$commtopsrcdir/mail/config/mozconfigs/win64/common-win64"
 
 ac_add_options --enable-debug
 

mail/config/mozconfigs/win64/l10n-mozconfig

@@ -1,5 +1,6 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
+. "$commtopsrcdir/mail/config/mozconfigs/win64/common-win64"
 
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"

mail/config/mozconfigs/win64/nightly

@@ -3,9 +3,7 @@
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
+. "$commtopsrcdir/mail/config/mozconfigs/win64/common-win64"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc