Backed out 2 changesets (bug 1731223) for likely causing localized Windows builds to break (bug 1732034) a=backout

Backed out changeset 0aa04e588a4e (bug 1731223)
Backed out changeset 59a15d9c5391 (bug 1731223)

moz.configure

@@ -408,6 +408,18 @@ 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)
 
 

toolkit/moz.configure

@@ -2521,18 +2521,3 @@ 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, compile_environment)
-def want_wine(target, host, compile_environment):
-    return compile_environment and target.kernel == "WINNT" and host.kernel != "WINNT"
-
-
-wine = check_prog(
-    "WINE",
-    ["wine64", "wine"],
-    when=want_wine,
-    bootstrap="wine/bin",
-)