public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust: Clean up target configs and test some more

Browse Source 
See the new docs for details. The difference is vis-a-vis older versions
of this PR, not master.
This commit is contained in:
John Ericson
2020-11-28 19:36:28 +00:00
parent 8ddf5c6907
commit b7650aaa77
3 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/rust/default.nix
+3 -3
View File
@@ -27,7 +27,7 @@
# 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: with platform.parsed; let
cpu_ = platform.rustc.arch or {
cpu_ = platform.rustc.platform.arch or {
"armv7a" = "armv7";
"armv7l" = "armv7";
"armv6l" = "arm";
@@ -38,8 +38,8 @@
# Returns the name of the rust target if it is standard, or the json file
# containing the custom target spec.
toRustTargetSpec = platform:
if (platform.rustc.arch or {}) ? custom
then builtins.toFile (platform.rustc.config + ".json") (builtins.toJSON platform.rustc.arch.custom)
if (platform.rustc or {}) ? platform
then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform)
else toRustTarget platform;
# This just contains tools for now. But it would conceivably contain