Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mesa: fix cross compilation to x86_64 #233628

Merged
merged 3 commits into from
Nov 9, 2023
Merged

mesa: fix cross compilation to x86_64 #233628

merged 3 commits into from
Nov 9, 2023

Commits on Nov 6, 2023

  1. lib.systems: elaborate Rust metadata 

    We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
    @alyssais
    alyssais committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    9bc04e4 View commit details
    Browse the repository at this point in the history

  2. stdenv: fix meson rust cross compilation

    @alyssais
    alyssais committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    c258730 View commit details
    Browse the repository at this point in the history

  3. mesa: fix cross compilation to x86_64 

    In particular, fix cross compilation of rusticl.
    @alyssais
    alyssais committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    133dcd5 View commit details
    Browse the repository at this point in the history