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
This commit is contained in:
Amanieu d'Antras 2021-07-28 22:28:07 +02:00 committed by GitHub
commit 81f6f471fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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