Skip to content

Commit

Permalink
Bug 1731223 - Move wine detection to toolkit/moz.configure. r=firefox…
Browse files Browse the repository at this point in the history
…-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
  • Loading branch information
glandium committed Sep 22, 2021
1 parent 098772c commit feecbba
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
12 changes: 0 additions & 12 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
16 changes: 16 additions & 0 deletions toolkit/moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

0 comments on commit feecbba

Please sign in to comment.