meson: Clean up build and infra #86080
Conversation
I've since convinced upstream to not use such vars for the build platform during cross. Finally!
That seems like it's unrelated |
|
Oops sorry! meant mesonbuild/meson#6363 |
| armv7l = "arm"; | ||
| i686 = "x86"; | ||
| x86_64 = "x86_64"; | ||
| }; |
There was a problem hiding this comment.
I think this should default to the cpu.name when none match.
There was a problem hiding this comment.
Fair, but let's do that in a follow-up? I just moved it as-is for now.
| }; | ||
| crossFile = builtins.toFile "cross-file.conf" ('' | ||
| [properties] | ||
| needs_exe_wrapper = true |
There was a problem hiding this comment.
I don’t think we should set this.
There was a problem hiding this comment.
Well, it was what was there so I rather change separately, but I do agree. Didn't you make a thing just for this sort of thing?
See comment in code and the PR it references, mesonbuild/meson#6827, for details. We can remove entries from the cross file because they will be gotten from env vars now.
Ericson2314
force-pushed
the
fix-meson-cross
branch
from
d49e2c1
to
6c7bd57
Compare
|
@matthewbauer so what i ended up doing is removing most of the items from |
The cross file is added in the `mkDerivation`. It isn't nice putting build tool-specific stuff here, but our current architecture gives us little alternative.
Ericson2314
force-pushed
the
fix-meson-cross
branch
from
6c7bd57
to
8245230
Compare
|
Ugh I missed ofborg telling me I broke eval on staging. Fixing in a moment. |
Actually, we shouldn't really need this. We are building `native: false` binaries so when we look up a `native: true` binary the override should not apply. I've fixed this upstream in meson in NixOS/nixpkgs#86080, though some backwards compatibility migration might be in order. In the meantime, we can make `gi_cross_use_host_gi` prevent the overrides from happening, which will achieve the desired behavior. Finally, this allows us to use `find_program` in `scanner_command`, unconditionally, letting the presence of the override dictate whether a freshly-built or pre-built `g-ir-scanner` is used.
Motivation for this change
The big thing that happened is that mesonbuild/meson#6363 was finally merged!
Fixes #58831
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)CC @matthewbauer @jtojnar