Merge pull request #258540 from Artturin/renamebootstrapfiles

bootstrap-tools-cross: Rename bootstrap file jobs to be more descriptive
This commit is contained in:
John Ericson 2023-10-04 09:59:11 -04:00 committed by GitHub
commit 516b57b629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 27 additions and 27 deletions

View file

@ -1,5 +1,5 @@
# Use busybox for i686-linux since it works on x86_64-linux as well. # Use busybox for i686-linux since it works on x86_64-linux as well.
(import ./i686.nix) // (import ./i686-unknown-linux-gnu.nix) //
{ {
bootstrapTools = import <nix/fetchurl.nix> { bootstrapTools = import <nix/fetchurl.nix> {

View file

@ -59,24 +59,24 @@
, bootstrapFiles ? , bootstrapFiles ?
let table = { let table = {
glibc = { glibc = {
i686-linux = import ./bootstrap-files/i686.nix; i686-linux = import ./bootstrap-files/i686-unknown-linux-gnu.nix;
x86_64-linux = import ./bootstrap-files/x86_64.nix; x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-gnu.nix;
armv5tel-linux = import ./bootstrap-files/armv5tel.nix; armv5tel-linux = import ./bootstrap-files/armv5tel-unknown-linux-gnueabi.nix;
armv6l-linux = import ./bootstrap-files/armv6l.nix; armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-gnueabihf.nix;
armv7l-linux = import ./bootstrap-files/armv7l.nix; armv7l-linux = import ./bootstrap-files/armv7l-unknown-linux-gnueabihf.nix;
aarch64-linux = import ./bootstrap-files/aarch64.nix; aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-gnu.nix;
mipsel-linux = import ./bootstrap-files/mipsel.nix; mipsel-linux = import ./bootstrap-files/mipsel-unknown-linux-gnu.nix;
mips64el-linux = import mips64el-linux = import
(if localSystem.isMips64n32 (if localSystem.isMips64n32
then ./bootstrap-files/mips64el-n32.nix then ./bootstrap-files/mips64el-unknown-linux-gnuabin32.nix.nix
else ./bootstrap-files/mips64el.nix); else ./bootstrap-files/mips64el-unknown-linux-gnuabi64.nix);
powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; powerpc64le-linux = import ./bootstrap-files/powerpc64le-unknown-linux-gnu.nix;
riscv64-linux = import ./bootstrap-files/riscv64.nix; riscv64-linux = import ./bootstrap-files/riscv64-unknown-linux-gnu.nix;
}; };
musl = { musl = {
aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; aarch64-linux = import ./bootstrap-files/aarch64-unknown-linux-musl.nix;
armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; armv6l-linux = import ./bootstrap-files/armv6l-unknown-linux-musleabihf.nix;
x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; x86_64-linux = import ./bootstrap-files/x86_64-unknown-linux-musl.nix;
}; };
}; };

View file

@ -15,18 +15,18 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; {
# NOTE: Only add platforms for which there are files in `./bootstrap-files`. # NOTE: Only add platforms for which there are files in `./bootstrap-files`.
# Sort following the sorting in `./default.nix` `bootstrapFiles` argument. # Sort following the sorting in `./default.nix` `bootstrapFiles` argument.
armv5tel = sheevaplug; armv5tel-unknown-linux-gnueabi = sheevaplug;
armv6l = raspberryPi; armv6l-unknown-linux-gnueabihf = raspberryPi;
armv7l = armv7l-hf-multiplatform; armv7l-unknown-linux-gnueabihf = armv7l-hf-multiplatform;
aarch64 = aarch64-multiplatform; aarch64-unknown-linux-gnu = aarch64-multiplatform;
mipsel-linux-gnu = mipsel-linux-gnu; mipsel-unknown-linux-gnu = mipsel-linux-gnu;
mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-unknown-linux-gnuabin32 = mips64el-linux-gnuabin32;
mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; mips64el-unknown-linux-gnuabi64 = mips64el-linux-gnuabi64;
powerpc64le = powernv; powerpc64le-unknown-linux-gnu = powernv;
riscv64 = riscv64; riscv64-unknown-linux-gnu = riscv64;
# musl # musl
aarch64-musl = aarch64-multiplatform-musl; aarch64-unknown-linux-musl = aarch64-multiplatform-musl;
armv6l-musl = muslpi; armv6l-unknown-linux-musleabihf = muslpi;
x86_64-musl = musl64; x86_64-unknown-linux-musl = musl64;
}) })