Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for the unstable check-cfg feature behind an environment variable #3037

Merged
merged 6 commits into from
Mar 8, 2023
Merged

Add support for the unstable check-cfg feature behind an environment variable #3037

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88b7f0d
refactor build script to use a function to set cfgs
pietroalbini Dec 14, 2022
f8a12ee
ensure all cfgs used are allowed
pietroalbini Dec 14, 2022
b636da0
emit rustc-check-cfg in the build script when LIBC_CHECK_CFG=1
pietroalbini Feb 24, 2023
e74f735
support extra check-cfg
pietroalbini Dec 14, 2022
b9a49d4
add ci job to test check-cfg
pietroalbini Dec 14, 2022
d63eedc
compatibility with rust 1.13.0
pietroalbini Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support extra check-cfg
  • Loading branch information
@pietroalbini
pietroalbini committed Mar 6, 2023
commit e74f73544f29fe3559081250b9a657a36bc860eb
11 changes: 11 additions & 0 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ const ALLOWED_CFGS: &[&str] = &[
"libc_union",
];

// Extra values to allow for check-cfg.
const CHECK_CFG_EXTRA: &[(&str, &[&str])] = &[
("target_os", &["switch", "aix", "ohos"]),
("target_env", &["illumos", "wasi", "aix", "ohos"]),
("target_arch", &["loongarch64"]),
];

fn main() {
// Avoid unnecessary re-building.
println!("cargo:rerun-if-changed=build.rs");
Expand Down Expand Up @@ -151,6 +158,10 @@ fn main() {
for cfg in ALLOWED_CFGS {
println!("cargo:rustc-check-cfg=values({})", cfg);
}
for (name, values) in CHECK_CFG_EXTRA {
let values = values.join("\",\"");
println!("cargo:rustc-check-cfg=values({},\"{}\")", name, values);
}
}
}

Expand Down