diff options
author | John Ericson <git@JohnEricson.me> | 2023-02-16 09:33:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-16 09:33:06 -0500 |
commit | 35d6d3d7b57996b77c2b4cd86ad0f9e4f96a25f0 (patch) | |
tree | 448713b1dd9e5e2ded564247395aa8684854a91f /pkgs/build-support | |
parent | d6959e9502505d96d1f73bcb118bfdc289179a6a (diff) | |
parent | 66dccd88b83838c821774e6c8de81c58caf37f65 (diff) |
Merge pull request #216555 from jordanisaacs/rust-vendor
build-support/rust/lib: Add `toTargetVendor`
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/rust/lib/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index 77397f9b7220c..aa5ba14c1397b 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -30,10 +30,17 @@ rec { else lib.optional platform.isUnix "unix" ++ lib.optional platform.isWindows "windows"; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_vendor + toTargetVendor = platform: let + inherit (platform.parsed) vendor; + in platform.rustc.platform.vendor or { + "w64" = "pc"; + }.${vendor.name} or vendor.name; + # Returns the name of the rust target, even if it is custom. Adjustments are # because rust has slightly different naming conventions than we do. toRustTarget = platform: let - inherit (platform.parsed) cpu vendor kernel abi; + inherit (platform.parsed) cpu kernel abi; cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; @@ -41,9 +48,7 @@ rec { "armv5tel" = "armv5te"; "riscv64" = "riscv64gc"; }.${cpu.name} or cpu.name; - vendor_ = platform.rustc.platform.vendor or { - "w64" = "pc"; - }.${vendor.name} or vendor.name; + vendor_ = toTargetVendor platform; in platform.rustc.config or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; |