Bug 1525111 - don't check for watchman on unsupported hosts; r=dmajor
authorNathan Froyd <froydnj@mozilla.com>
Mon, 04 Feb 2019 16:20:48 -0500
changeset 456661 b1745f2c218f4ff8f80f026d65cec40dc7cfb941
parent 456660 9b25ede0a1d3360ceb3c8e2c087a8c51ac7488ca
child 456662 898be859c1a45f7a42aa948516e49049f29b4878
push id111686
push usernfroyd@mozilla.com
push dateMon, 04 Feb 2019 21:21:03 +0000
treeherdermozilla-inbound@b1745f2c218f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1525111
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1525111 - don't check for watchman on unsupported hosts; r=dmajor This avoids issues with building on aarch64 windows, for instance.
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -436,19 +436,23 @@ def tup_include(build_backends, build_pr
 
 include(tup_include)
 
 # watchman detection
 # ==============================================================
 
 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')
 
     if not prog:
         return
 
     # `watchman version` will talk to the Watchman daemon service.
     # This can hang due to permissions problems. e.g.