|
@@ -38,13 +38,13 @@ diff --git a/python/mozbuild/mozbuild/action/make_dmg.py b/python/mozbuild/mozbu
|
|
- hfs_tool = bootstrap_toolchain("dmg/hfsplus")
|
|
- hfs_tool = bootstrap_toolchain("dmg/hfsplus")
|
|
- mkfshfs_tool = bootstrap_toolchain("hfsplus/newfs_hfs")
|
|
- mkfshfs_tool = bootstrap_toolchain("hfsplus/newfs_hfs")
|
|
+ dmg_tool = buildconfig.substs.get("DMG_TOOL")
|
|
+ dmg_tool = buildconfig.substs.get("DMG_TOOL")
|
|
-+ if dmg_tool is None:
|
|
|
|
|
|
++ if not dmg_tool:
|
|
+ dmg_tool = bootstrap_toolchain("dmg/dmg")
|
|
+ dmg_tool = bootstrap_toolchain("dmg/dmg")
|
|
+ hfs_tool = buildconfig.substs.get("HFS_TOOL")
|
|
+ hfs_tool = buildconfig.substs.get("HFS_TOOL")
|
|
-+ if hfs_tool is None:
|
|
|
|
|
|
++ if not hfs_tool:
|
|
+ hfs_tool = bootstrap_toolchain("dmg/hfsplus")
|
|
+ hfs_tool = bootstrap_toolchain("dmg/hfsplus")
|
|
+ mkfshfs_tool= buildconfig.substs.get("MKFSHFS")
|
|
+ mkfshfs_tool= buildconfig.substs.get("MKFSHFS")
|
|
-+ if mkfshfs_tool is None:
|
|
|
|
|
|
++ if not mkfshfs_tool:
|
|
+ mkfshfs_tool = bootstrap_toolchain("hfsplus/newfs_hfs")
|
|
+ mkfshfs_tool = bootstrap_toolchain("hfsplus/newfs_hfs")
|
|
|
|
|
|
dmg.create_dmg(
|
|
dmg.create_dmg(
|