Smarter msvc assembler search.

Author: grafikrobot

src/tools/clang-win.jam

@@ -141,8 +141,14 @@ rule init ( version ? : command * : options * )
             vswhere ?= [ os.environ "ProgramFiles" ] ;
             vswhere = "$(vswhere)/Microsoft Visual Studio/Installer/vswhere.exe" ;
             local vspath = [ SHELL "\"$(vswhere)\" -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64" ] ;
-            local vsasmpath = [ path.glob [ path.make "$(vspath)\\VC\\Tools\\MSVC" ] : */bin/*/*/$(target-assembler).exe ] ;
-            vsasmpath = [ path.native $(vsasmpath[-1]) ] ;
+            local msvcpath = [ path.glob [ path.make "$(vspath)\\VC\\Tools\\MSVC" ] : * ] ;
+            msvcpath = [ path.glob "$(msvcpath[-1])/bin" : Host* ] ;
+            msvcpath = [ path.glob "$(msvcpath)" : * ] ;
+            local vsasmpath = [ path.glob "$(msvcpath)" : "$(target-assembler).*" ] ;
+            if $(vsasmpath)
+            {
+                vsasmpath = [ path.native $(vsasmpath[-1]) ] ;
+            }
 
             local assembler = [ get-option "assembler" : $(addr) : $(options) ] ;
             local linker ;