Auto merge of #2086 - JohnTitor:s390x-musl, r=JohnTitor

Move `s390x-unknown-linux-musl` to build.sh Fixes #2085 r? `@ghost`
rust-lang · Feb 28, 2021 · 449b00b · 449b00b
2 parents 5fd6540 + 9fca609
commit 449b00b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
@@ -136,8 +136,6 @@ jobs:
           # FIXME: It seems some items in `src/unix/mod.rs`
           # aren't defined on redox actually.
           # x86_64-unknown-redox,
-          # FIXME: Enable when CI is building a toolchain for this target
-          # s390x-unknown-linux-musl,
         ]
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master

diff --git a/ci/build.sh b/ci/build.sh
@@ -238,6 +238,7 @@ riscv32imc-unknown-none-elf \
 riscv32gc-unknown-linux-gnu \
 riscv64gc-unknown-none-elf \
 riscv64imac-unknown-none-elf \
+s390x-unknown-linux-musl \
 sparc-unknown-linux-gnu \
 sparc64-unknown-netbsd \