Bug 1514089 - Move fxc and wine detection to toolkit/moz.configure. r=froydnj

They are not necessary to build e.g. standalone spidermonkey.

Differential Revision: https://phabricator.services.mozilla.com/D14513

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2018-12-14 14:56:04 +00:00
Родитель 3cdfb81c07
Коммит c2b01ab3f1
2 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -1451,14 +1451,6 @@ def is_windows(target, host):
include('windows.configure', when=is_windows)
# 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'))
# LTO
# ==============================================================

Просмотреть файл

@ -1268,3 +1268,12 @@ option('--enable-layout-debugger',
help='{Enable|Disable} layout debugger')
set_config('MOZ_LAYOUT_DEBUGGER', depends_if('--enable-layout-debugger')(lambda _: True))
# 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'))