From 2a9eb52a314a5cbfd07d19959f002ab080543722 Mon Sep 17 00:00:00 2001
From: Ciure Andrei <aciure@mozilla.com>
Date: Fri, 22 Mar 2019 10:47:36 +0200
Subject: [PATCH] Backed out changeset 40832d187454 (bug 1537669) for causing
 ActivationContext.cpp asertion failures CLOSED TREE

---
 build/moz.configure/windows.configure | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure
index ab9c0b99a494..fbe97785dee7 100644
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -461,17 +461,13 @@ def sdk_bin_path(valid_windows_sdk_dir, valid_ucrt_sdk_dir):
     return result
 
 
-mt = check_prog('MT', ('llvm-mt', 'mt'), input='MT',
+mt = check_prog('MT', ('mt.exe',), input='MT',
                 paths=sdk_bin_path)
 
 
-@depends(mt)
-def mt_not_llvm_mt(mt):
-    return not os.path.basename(mt).lower().startswith('llvm')
-
 # Check that MT is not something unexpected like "magnetic tape manipulation
 # utility".
-@depends(mt, when=mt_not_llvm_mt)
+@depends(mt)
 @checking('whether MT is really Microsoft Manifest Tool', lambda x: bool(x))
 @imports('subprocess')
 def valid_mt(path):