Skip to content

Commit c88b021

Browse files
committed
Adjust the std library for sanitizer_cfi cfgs changes
1 parent cc6cbaa commit c88b021

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

library/std/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@
265265
//
266266
// Language features:
267267
// tidy-alphabetical-start
268+
#![cfg_attr(not(bootstrap), feature(cfg_sanitizer_cfi))]
268269
#![feature(alloc_error_handler)]
269270
#![feature(allocator_internals)]
270271
#![feature(allow_internal_unsafe)]

library/std/src/sys/unix/thread_local_dtor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Note, however, that we run on lots older linuxes, as well as cross
1212
// compiling from a newer linux to an older linux, so we also have a
1313
// fallback implementation to use as well.
14-
#[allow(unexpected_cfgs)]
14+
#[cfg_attr(bootstrap, allow(unexpected_cfgs))]
1515
#[cfg(any(
1616
target_os = "linux",
1717
target_os = "android",

0 commit comments

Comments
 (0)