# HG changeset patch # User Mike Hommey # Date 1544895899 0 # Node ID 07c40fd43ee1f3220cc77f2d45de86a4418fc47f # Parent e71037d9238164fde07141d2b4cda76fd56ed914 Bug 1514448 - Only check for fxc/wine when building with a compile environment. r=froydnj Bug 1514089 moved the check from toolchain.configure, which is only included when a compile environment is available, to toolkit/moz.configure, which doesn't have this limitation. As a consequence, artifact/l10n builds ended up requiring those tools, while they didn't require them before. Differential Revision: https://phabricator.services.mozilla.com/D14675 diff --git a/toolkit/moz.configure b/toolkit/moz.configure --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -1234,20 +1234,21 @@ option('--enable-reflow-perf', # in old-configure, which was unexplained there as well. set_define('MOZ_REFLOW_PERF', depends_if('--enable-reflow-perf')(lambda _: True)) set_define('MOZ_REFLOW_PERF_DSP', reflow_perf) # Shader Compiler for Windows (and MinGW Cross Compile) # ============================================================== -fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target) - (lambda t: t.kernel == 'WINNT')) -wine = check_prog('WINE', ['wine'], when=depends(target, host) - (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux')) +with only_when(compile_environment): + fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target) + (lambda t: t.kernel == 'WINNT')) + wine = check_prog('WINE', ['wine'], when=depends(target, host) + (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux')) # Alternative Crashreporter setting option("--with-crashreporter-url", env="MOZ_CRASHREPORTER_URL", default="https://crash-reports.mozilla.com/", nargs=1, help="Set an alternative crashreporter url") set_config("MOZ_CRASHREPORTER_URL",