Merge pull request #272 from fhanau:felix/clang-cl-masm-revert

PiperOrigin-RevId: 696878198 Change-Id: Ib50f61a9c0e5d56b049d25a913bf7ada3ee81ba7
bazelbuild · Nov 15, 2024 · a0e347f · a0e347f
2 parents fe7ca63 + c5a0333
commit a0e347f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/cc/private/toolchain/windows_cc_configure.bzl b/cc/private/toolchain/windows_cc_configure.bzl
@@ -827,8 +827,7 @@ def _get_clang_cl_vars(repository_ctx, paths, msvc_vars, target_arch):
         "%{clang_cl_cl_path_" + target_arch + "}": clang_cl_path,
         "%{clang_cl_link_path_" + target_arch + "}": lld_link_path,
         "%{clang_cl_lib_path_" + target_arch + "}": llvm_lib_path,
-        # clang-cl does not support assembly files as input.
-        "%{clang_cl_ml_path_" + target_arch + "}": msvc_vars["%{msvc_ml_path_" + target_arch + "}"],
+        "%{clang_cl_ml_path_" + target_arch + "}": clang_cl_path,
         # LLVM's lld-link.exe doesn't support /DEBUG:FASTLINK.
         "%{clang_cl_dbg_mode_debug_flag_" + target_arch + "}": "/DEBUG",
         "%{clang_cl_fastbuild_mode_debug_flag_" + target_arch + "}": "/DEBUG",