Bug 1387227 - Use tooltool provided xz; r=me

MozReview-Commit-ID: 8uc7HDN3IVT --HG-- extra : rebase_source : 47a4772bd2fe0f02a6de3af107578c3ef0cb9f52 extra : histedit_source : 62936a6a5b8926ebcd03548f14700f62b0550a92
2017-08-03 18:50:39 -06:00 · 2017-08-03 18:50:39 -06:00 · a3339b7c6b
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@ -29,3 +29,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@ -30,3 +30,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@ -33,3 +33,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@ -33,3 +33,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@ -29,3 +29,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@ -29,3 +29,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@ -33,3 +33,6 @@ mk_export_correct_style INCLUDE
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"