treewide: Get rid of *Platform.arch
#40270
Conversation
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
Ericson2314
force-pushed
the
lib-platform-simplify
branch
from
f509fb6
to
c17f79e
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 0
10.rebuild-linux: 0
and removed
10.rebuild-darwin: 501+
10.rebuild-linux: 501+
labels
| float = "hard"; | ||
| fpu = "vfp"; | ||
| platform = platforms.raspberrypi; | ||
| }; | ||
|
|
||
| armv7l-hf-multiplatform = rec { | ||
| config = "arm-unknown-linux-gnueabihf"; | ||
| arch = "armv7-a"; | ||
| config = "armv7a-unknown-linux-gnueabihf"; |
There was a problem hiding this comment.
This change doesn' seem related and how do you know this doesn't break something?
There was a problem hiding this comment.
It is related in that all the parsed.cpu.name stuff would get arm instead of armv7-a. This is a different string but at least means the same thing. If those build systems just pass --arch right to gcc with -march or whatever, then we should have them use hostPlatform.platform.gcc.arch instead of hostPlatform.parsed.cpu.name.
| @@ -118,7 +118,7 @@ let | |||
| "--cross-prefix=${stdenv.cc.targetPrefix}" | |||
| "--enable-cross-compile" | |||
| "--target_os=linux" | |||
| "--arch=${hostPlatform.arch}" | |||
| "--arch=${hostPlatform.parsed.cpu.name}" | |||
There was a problem hiding this comment.
Why do these attribute names contain "parsed"? Doesn't make much sense to me.
There was a problem hiding this comment.
In trying to reconcile crossSystem, system, platform, and @nbp's previously-dead parsing code, yes I had to find some awkward unused namespace at first to avoid breaking things. (hostPlatform.arch is inconsistent, but closer to hostPlatform.platform.gcc.arch.) Once I do changes like this, I get closer to being able to drop the parsed and move everything up a level.
Motivation for this change
Use
parsed.cpu.nameorplatform.gcc.archinstead.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)