Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ml path for Windows clang-cl cc toolchain #23337

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/test/py/bazel/bazel_windows_cpp_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -789,14 +789,38 @@ def testBuildWithClangClByToolchainResolution(self):
'',
'cc_binary(',
' name = "main",',
' srcs = ["main.cc"],',
' srcs = ['
' "main.cc",',
' "inc.asm",', # Test assemble action_config
' "dec.S",', # Test preprocess-assemble action_config
' ],',
')',
])
self.ScratchFile('main.cc', [
'int main() {',
' return 0;',
'}',
])
self.ScratchFile('inc.asm', [
'.code',
'PUBLIC increment',
'increment PROC x:WORD',
' xchg rcx,rax',
' inc rax',
' ret',
'increment EndP',
'END',
])
self.ScratchFile('dec.S', [
'.code',
'PUBLIC decrement',
'decrement PROC x:WORD',
' xchg rcx,rax',
' dec rax',
' ret',
'decrement EndP',
'END',
])
exit_code, _, stderr = self.RunBazel(['build', '-s', '//:main'])
self.AssertExitCode(exit_code, 0, stderr)
self.assertIn('clang-cl.exe', ''.join(stderr))
Expand Down
3 changes: 2 additions & 1 deletion tools/cpp/windows_cc_configure.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,8 @@ 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_ml_path_" + target_arch + "}": clang_cl_path,
# clang-cl does not support assembly files as input.
"%{clang_cl_ml_path_" + target_arch + "}": msvc_vars["%{msvc_ml_path_" + target_arch + "}"],
# 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",
Expand Down
Loading