зеркало из https://github.com/mozilla/gecko-dev.git
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 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
92c4139a6d
Коммит
9f78d85f7d
|
@ -1273,7 +1273,8 @@ set_config('MOZ_LAYOUT_DEBUGGER', depends_if('--enable-layout-debugger')(lambda
|
|||
# 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'))
|
||||
|
|
Загрузка…
Ссылка в новой задаче