Skip to content

Relax the build target checks in windows-targets sub-crates #2774

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

Merged
merged 2 commits into from
Jan 5, 2024
+28 −11
Merged

Relax the build target checks in windows-targets sub-crates #2774

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3a01a
Relax the build target checks in windows-targets sub-crates
seritools Jan 4, 2024
01b0ae0
Relax the build target checks for gnu and gnullvm targets as well
seritools Jan 4, 2024
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
6 changes: 4 additions & 2 deletions crates/targets/aarch64_msvc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" {
let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
if family != "windows" || arch != "aarch64" || env != "msvc" {
return;
}

Expand Down
6 changes: 4 additions & 2 deletions crates/targets/i686_msvc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
if target != "i686-pc-windows-msvc" && target != "i686-uwp-windows-msvc" {
let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
if family != "windows" || arch != "x86" || env != "msvc" {
return;
}

Expand Down
6 changes: 4 additions & 2 deletions crates/targets/x86_64_msvc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
if target != "x86_64-pc-windows-msvc" && target != "x86_64-uwp-windows-msvc" {
let family = std::env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
let env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap();
if family != "windows" || arch != "x86_64" || env != "msvc" {
return;
}

Expand Down