Merge pull request #139697 from oxalica/bp/fix/to-rust-target

[21.05] fix toRustTarget for windows
NixOS · Sep 28, 2021 · 96bf839 · 96bf839
2 parents ce6b39b + c9049f7
commit 96bf839
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
@@ -37,8 +37,11 @@
       "armv6l" = "arm";
       "armv5tel" = "armv5te";
     }.${cpu.name} or cpu.name;
+    vendor_ = platform.rustc.platform.vendor or {
+      "w64" = "pc";
+    }.${vendor.name} or vendor.name;
   in platform.rustc.config
-    or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
+    or "${cpu_}-${vendor_}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
 
   # Returns the name of the rust target if it is standard, or the json file
   # containing the custom target spec.