Skip to content

dist(release/1.29): backport patches, pt. 3 #4939

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

Open
rami3l wants to merge 1 commit into
base: release/1.29
Choose a base branch
from
+15 −18
Open

dist(release/1.29): backport patches, pt. 3 #4939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 15 additions & 18 deletions src/dist/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,13 +667,8 @@ impl TargetTuple {
let ret = if partial_self.os != partial_other.os {
false
} else if partial_self.os.as_deref() == Some("pc-windows") {
// Windows is a special case here: we can run gnu and msvc on the same system,
// x86_64 can run i686, and aarch64 can run i686 through emulation
(partial_self.arch == partial_other.arch)
|| (partial_self.arch.as_deref() == Some("x86_64")
&& partial_other.arch.as_deref() == Some("i686"))
|| (partial_self.arch.as_deref() == Some("aarch64")
&& partial_other.arch.as_deref() == Some("i686"))
// Windows is a special case here: we can run gnu and msvc on the same system.
partial_self.arch == partial_other.arch
} else {
// For other OSes, for now, we assume other toolchains won't run
false
Expand Down Expand Up @@ -1465,31 +1460,33 @@ mod tests {
&["i686-unknown-linux-gnu"],
),
(
// On the other hand, 64 bit Windows
// On the other hand, Windows msvc
"x86_64-pc-windows-msvc",
// is compatible with 32 bit windows, and even gnu
// is compatible with Windows gnu
&["x86_64-pc-windows-gnu"],
// But is not compatible with Linux
&[
"x86_64-unknown-linux-gnu",
// or 32-bit Windows
"i686-pc-windows-msvc",
"x86_64-pc-windows-gnu",
"i686-pc-windows-gnu",
],
// But is not compatible with Linux
&["x86_64-unknown-linux-gnu"],
),
(
// Indeed, 64bit windows with the gnu toolchain
// And the Windows gnu toolchain
"x86_64-pc-windows-gnu",
// is compatible with the other windows platforms
// is compatible with Windows msvc
&["x86_64-pc-windows-msvc"],
// But is not compatible with Linux despite also being gnu
&[
"x86_64-unknown-linux-gnu",
// And is not compatible with 32-bit Windows
"i686-pc-windows-msvc",
"x86_64-pc-windows-gnu",
"i686-pc-windows-gnu",
],
// But is not compatible with Linux despite also being gnu
&["x86_64-unknown-linux-gnu"],
),
(
// However, 32bit Windows is not expected to be able to run
// 32bit Windows is not expected to be able to run
// 64bit windows
"i686-pc-windows-msvc",
&["i686-pc-windows-gnu"],
Expand Down
Loading