Skip to content

Commit

Permalink
Bug 1525111 - don't check for watchman on unsupported hosts; r=dmajor
Browse files Browse the repository at this point in the history
This avoids issues with building on aarch64 windows, for instance.
  • Loading branch information
froydnj committed Feb 4, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent a01a1ce commit 1f2d8ad
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions moz.configure
Original file line number Diff line number Diff line change
@@ -441,9 +441,13 @@ include(tup_include)

option(env='WATCHMAN', nargs=1, help='Path to the watchman program')

@depends('WATCHMAN')
@depends(host, 'WATCHMAN')
@checking('for watchman', callback=lambda w: w.path if w else 'not found')
def watchman(prog):
def watchman(host, prog):
# On Windows, `watchman` is only supported on 64-bit hosts.
if host.os == 'WINNT' and host.cpu != 'x86_64':
return

if not prog:
prog = find_program('watchman')

0 comments on commit 1f2d8ad

Please sign in to comment.