--- 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