Skip to content

Commit 0c81fa6

Browse files
authored
Merge pull request #431 from wesleywiser/fix_lse_on_aarch64_msvc
Don't try to build out-of-line aarch64 atomics with the msvc toolchain
2 parents 31cf80b + c03b91f commit 0c81fa6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,9 @@ mod c {
491491

492492
// Include out-of-line atomics for aarch64, which are all generated by supplying different
493493
// sets of flags to the same source file.
494+
// Note: Out-of-line aarch64 atomics are not supported by the msvc toolchain (#430).
494495
let src_dir = root.join("lib/builtins");
495-
if target_arch == "aarch64" {
496+
if target_arch == "aarch64" && target_env != "msvc" {
496497
// See below for why we're building these as separate libraries.
497498
build_aarch64_out_of_line_atomics_libraries(&src_dir, cfg);
498499

0 commit comments

Comments
 (0)