From cd1bfdd3d7de0b6c10666aadbd44e2660a678cfe Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Mon, 1 Oct 2018 10:20:12 -0400 Subject: [PATCH 1/2] add an appveyor config for aarch64-pc-windows-msvc Fixes #53864. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b1e2e1545cf..98c6cbd1ca9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -82,11 +82,13 @@ environment: # 32/64 bit MSVC and GNU deployment - RUST_CONFIGURE_ARGS: > --build=x86_64-pc-windows-msvc + --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc --enable-full-tools --enable-profiler SCRIPT: python x.py dist DEPLOY: 1 CI_JOB_NAME: dist-x86_64-msvc + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview - RUST_CONFIGURE_ARGS: > --build=i686-pc-windows-msvc --target=i586-pc-windows-msvc From ebf6507d1370bdbe919c63a1996204b3b9291e8a Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 30 Oct 2018 16:54:34 -0400 Subject: [PATCH 2/2] switch to LLVM 7.0 as the host compiler This version ought to work better with MSVC 15.9 preview headers. --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 98c6cbd1ca9..3e1417dbb8e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -149,9 +149,9 @@ install: # Note that the LLVM installer is an NSIS installer # # Original downloaded here came from - # http://releases.llvm.org/6.0.0/LLVM-6.0.0-win64.exe - - if NOT defined MINGW_URL appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/LLVM-6.0.0-win64.exe - - if NOT defined MINGW_URL .\LLVM-6.0.0-win64.exe /S /NCRC /D=C:\clang-rust + # http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe + - if NOT defined MINGW_URL appveyor-retry appveyor DownloadFile https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/LLVM-7.0.0-win64.exe + - if NOT defined MINGW_URL .\LLVM-7.0.0-win64.exe /S /NCRC /D=C:\clang-rust - if NOT defined MINGW_URL set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=C:\clang-rust\bin\clang-cl.exe # Here we do a pretty heinous thing which is to mangle the MinGW installation