Bug 1731223 - Move wine detection to toolkit/moz.configure. r=firefox-build-system-reviewers,andi

As of now, wine is used with:
- fxc, which is detected in toolkit/moz.configure
- midl, which is detected in toolkit/moz.configure
- ml64 or armasm64, for some assembly sources that aren't used in
  projects that don't include toolkit/moz.configure.

We can thus move it there.

Differential Revision: https://phabricator.services.mozilla.com/D126166
This commit is contained in:
Mike Hommey 2021-09-22 23:54:26 +00:00
Родитель 098772c2c1
Коммит feecbbaa4f
2 изменённых файлов: 16 добавлений и 12 удалений

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

@ -408,18 +408,6 @@ def check_prog(*args, **kwargs):
return check_prog(*args, **kwargs)
@depends(target, host)
def want_wine(target, host):
return target.kernel == "WINNT" and host.kernel != "WINNT"
wine = check_prog(
"WINE",
["wine64", "wine"],
allow_missing=True,
when=want_wine,
bootstrap="wine/bin",
)
check_prog("WGET", ("wget",), allow_missing=True)

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

@ -2521,3 +2521,19 @@ def oxidized_breakpad(target):
set_config("MOZ_OXIDIZED_BREAKPAD", True, when=oxidized_breakpad)
set_define("MOZ_OXIDIZED_BREAKPAD", True, when=oxidized_breakpad)
# Wine
# ==============================================================
@depends(target, host)
def want_wine(target, host):
return target.kernel == "WINNT" and host.kernel != "WINNT"
wine = check_prog(
"WINE",
["wine64", "wine"],
allow_missing=True,
when=want_wine,
bootstrap="wine/bin",
)