Skip to content

Commit 1721269

Browse files
committed
This was causing build failures on AArch64 due to name resolution ambiguity.
1 parent dbb244a commit 1721269

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/aarch64_linux.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,12 @@ macro_rules! or {
266266
};
267267
}
268268

269-
// See `generate_aarch64_outlined_atomics` in build.rs.
270-
include!(concat!(env!("OUT_DIR"), "/outlined_atomics.rs"));
269+
// Work around https://github.com/rust-lang/rust/issues/113533
270+
mod macros {
271+
// See `generate_aarch64_outlined_atomics` in build.rs.
272+
include!(concat!(env!("OUT_DIR"), "/outlined_atomics.rs"));
273+
}
274+
271275
foreach_cas!(compare_and_swap);
272276
foreach_cas16!(compare_and_swap_i128);
273277
foreach_swp!(swap);

0 commit comments

Comments
 (0)