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.

Sign up for GitHub

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

Jump to bottom

[7.4.0] Fix ml path for Windows clang-cl cc toolchain #23406

Merged
merged 2 commits into from
Aug 28, 2024
Merged

[7.4.0] Fix ml path for Windows clang-cl cc toolchain #23406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbc4e22
Fix ml path for Windows clang-cl cc toolchain
michaelsiegrist Aug 22, 2024
1a55e1c
Clean up
iancha1992 Aug 26, 2024
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
75 changes: 55 additions & 20 deletions src/test/py/bazel/bazel_windows_cpp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,26 +775,61 @@ def testBuildWithClangClByToolchainResolution(self):
' "@local_config_cc//:cc-toolchain-x64_windows-clang-cl",',
')',
])
self.ScratchFile('BUILD', [
'platform(',
' name = "windows_clang",',
' constraint_values = [',
' "@platforms//cpu:x86_64",',
' "@platforms//os:windows",',
' "@bazel_tools//tools/cpp:clang-cl",',
' ]',
')',
'',
'cc_binary(',
' name = "main",',
' srcs = ["main.cc"],',
')',
])
self.ScratchFile('main.cc', [
'int main() {',
' return 0;',
'}',
])
self.ScratchFile(
'BUILD',
[
'platform(',
' name = "windows_clang",',
' constraint_values = [',
' "@platforms//cpu:x86_64",',
' "@platforms//os:windows",',
' "@bazel_tools//tools/cpp:clang-cl",',
' ]',
')',
'',
'cc_binary(',
' name = "main",',
' 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', '--incompatible_enable_cc_toolchain_resolution=true',
'//:main'
Expand Down
3 changes: 2 additions & 1 deletion tools/cpp/windows_cc_configure.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,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