diff options
| author | bors <bors@rust-lang.org> | 2020-10-12 10:17:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-12 10:17:48 +0000 |
| commit | d9b931669b9c480b60f0abcaa7834758ba8761a2 (patch) | |
| tree | 816a374f72050b3073e775f40602672124c2424a /src/ci/scripts | |
| parent | a8d6da3f57f9cc85ddbe1d73e72e3523de7ac245 (diff) | |
| parent | 0a4dc8bc161c68320a60a6bde525adae258b6252 (diff) | |
| download | rust-d9b931669b9c480b60f0abcaa7834758ba8761a2.tar.gz rust-d9b931669b9c480b60f0abcaa7834758ba8761a2.zip | |
Auto merge of #75914 - arlosi:aarch64-ci, r=pietroalbini
Promote aarch64-pc-windows-msvc to Tier 2 Development Platform Adds a GitHub Actions CI build for `aarch64-pc-windows-msvc` via cross-compilation on an x86_64 host. This promotes `aarch64-pc-windows-msvc` from a Tier 2 Compilation Target (std) to a Tier 2 Development Platform (std+rustc+cargo+tools). Fixes #72881 r? `@pietroalbini`
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index ae85d5cab01..1685fbbbbba 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -42,6 +42,13 @@ if isWindows; then arch=x86_64 mingw_archive="${MINGW_ARCHIVE_64}" ;; + *aarch64*) + # aarch64 is a cross-compiled target. Use the x86_64 + # mingw, since that's the host architecture. + bits=64 + arch=x86_64 + mingw_archive="${MINGW_ARCHIVE_64}" + ;; *) echo "src/ci/scripts/install-mingw.sh can't detect the builder's architecture" echo "please tweak it to recognize the builder named '${CI_JOB_NAME}'" |