Skip to content

Commit 8088894

Browse files
committed
allow check-cfg for rust 1.80
1 parent 2cef0c9 commit 8088894

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use std::str;
77
// make sure to add it to this list as well.
88
const ALLOWED_CFGS: &'static [&'static str] = &[
99
"emscripten_new_stat_abi",
10+
"espidf_time64",
1011
"freebsd10",
1112
"freebsd11",
1213
"freebsd12",
@@ -35,7 +36,7 @@ fn main() {
3536
let (rustc_minor_ver, is_nightly) = rustc_minor_nightly();
3637
let rustc_dep_of_std = env::var("CARGO_FEATURE_RUSTC_DEP_OF_STD").is_ok();
3738
let libc_ci = env::var("LIBC_CI").is_ok();
38-
let libc_check_cfg = env::var("LIBC_CHECK_CFG").is_ok();
39+
let libc_check_cfg = rustc_minor_ver >= 80 || env::var("LIBC_CHECK_CFG").is_ok();
3940
let const_extern_fn_cargo_feature = env::var("CARGO_FEATURE_CONST_EXTERN_FN").is_ok();
4041

4142
// The ABI of libc used by std is backward compatible with FreeBSD 12.

libc-test/test/makedev.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mod t {
7979

8080
// These OSes allow 32 bits for both minor and major
8181
#[cfg(any(
82-
target_os = "empscripten",
82+
target_os = "emscripten",
8383
target_os = "freebsd",
8484
target_os = "fuchsia",
8585
target_os = "linux",

0 commit comments

Comments
 (0)