Merge pull request #82882 from obsidiansystems/armv6-embedded

Misc fixes for armv6 bare metal cross
2020-03-19 10:38:22 -04:00
parent d96bd3394b 7c0d3f6f70
commit 19a0b38cbe
12 changed files with 99 additions and 49 deletions
@@ -18,8 +18,9 @@
      "armv7a" = "armv7";
      "armv7l" = "armv7";
      "armv6l" = "arm";
-    }.${cpu.name} or cpu.name;
-  in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
+    }.${cpu.name} or platform.rustc.arch or cpu.name;
+  in platform.rustc.config
+    or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";

  makeRustPlatform = { rustc, cargo, ... }: rec {
    rust = {