Skip to content

Commit 815a0f0

Browse files
committed
update
1 parent 3ed644a commit 815a0f0

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

builtins-test-intrinsics/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,9 @@ publish = false
88
compiler_builtins = { path = "../", features = ["compiler-builtins"]}
99
panic-handler = { path = '../crates/panic-handler' }
1010

11+
[target.'cfg(target_family = "windows")'.dependencies]
12+
# enable mem on Windows, required for panic machinery
13+
compiler_builtins = { path = "../", features = ["compiler-builtins", "mem"]}
14+
1115
[features]
1216
c = ["compiler_builtins/c"]

builtins-test-intrinsics/src/main.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,9 @@ fn run() {
630630
something_with_a_dtor(&|| assert_eq!(bb(1), 1));
631631

632632
// Ensure panic machinery gets linked, but still allow this to run to completion.
633+
// FIXME(windows): we should have this on Windows too but it requires a lot more
634+
// missing symbols.
635+
#[cfg(not(windows))]
633636
if bb(false) {
634637
panic!();
635638
}

0 commit comments

Comments
 (0)