Bug 1380781 - Mac release promotion l10n repacks fail to download find mkfshfs r=glandium
authorRail Aliiev <rail@mozilla.com>
Tue, 18 Jul 2017 07:13:10 -0400
changeset 418057 48c6a63f1ac8897c1dfffbacd333ccd750e9b439
parent 418056 b9031e50fd764e92d10055bc97a916a0e8e7deab
child 418058 0be298129be1221d42b269a61ab3911349738e70
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1380781
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1380781 - Mac release promotion l10n repacks fail to download find mkfshfs r=glandium MozReview-Commit-ID: IYSAv7VMbzF
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,17 +1,18 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.no-compile"
 
-# We need to indicate the target for cross builds
-ac_add_options --target=x86_64-apple-darwin
-
-export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
-export DMG_TOOL=$topsrcdir/dmg/dmg
-export HFS_TOOL=$topsrcdir/dmg/hfsplus
+if test `uname -s` = "Linux"; then
+  # We need to indicate the target for cross builds
+  ac_add_options --target=x86_64-apple-darwin
+  export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
+  export DMG_TOOL=$topsrcdir/dmg/dmg
+  export HFS_TOOL=$topsrcdir/dmg/hfsplus
+fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
@@ -1,17 +1,18 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.no-compile"
 
-# We need to indicate the target for cross builds
-ac_add_options --target=x86_64-apple-darwin
-
-export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
-export DMG_TOOL=$topsrcdir/dmg/dmg
-export HFS_TOOL=$topsrcdir/dmg/hfsplus
+if test `uname -s` = "Linux"; then
+  # We need to indicate the target for cross builds
+  ac_add_options --target=x86_64-apple-darwin
+  export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
+  export DMG_TOOL=$topsrcdir/dmg/dmg
+  export HFS_TOOL=$topsrcdir/dmg/hfsplus
+fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/aurora
 
 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi