Update LLVM version used on Appveyor bot, remove MSVC 2015 bot

llvm-svn: 345652

diff --git a/libcxx/appveyor-reqs-install.cmd b/libcxx/appveyor-reqs-install.cmd
index a416011..02c939e 100644 (file)
--- a/libcxx/appveyor-reqs-install.cmd
+++ b/libcxx/appveyor-reqs-install.cmd
@@ -9,7 +9,7 @@ cd C:\projects\deps
 :: Setup Compiler
 ::###########################################################################
 if NOT EXIST llvm-installer.exe (
-  appveyor DownloadFile http://prereleases.llvm.org/win-snapshots/LLVM-7.0.0-r325576-win32.exe -FileName llvm-installer.exe
+  appveyor DownloadFile https://prereleases.llvm.org/win-snapshots/LLVM-8.0.0-r345380-win32.exe -FileName llvm-installer.exe
 )
 if "%CLANG_VERSION%"=="ToT" (
     START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"

diff --git a/libcxx/appveyor.yml b/libcxx/appveyor.yml
index be69a55..0154abb 100644 (file)
--- a/libcxx/appveyor.yml
+++ b/libcxx/appveyor.yml
@@ -19,14 +19,6 @@ environment:
       MAKE_PROGRAM: ninja
       APPVEYOR_SAVE_CACHE_ON_ERROR: true
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_OPTIONS: -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe
-      CLANG_VERSION: 4
-      MSVC_SETUP_PATH: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
-      MSVC_SETUP_ARG: x86_amd64
-      GENERATOR: Ninja
-      MAKE_PROGRAM: ninja
-      APPVEYOR_SAVE_CACHE_ON_ERROR: true
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       MINGW_PATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin
       GENERATOR: MinGW Makefiles
       MAKE_PROGRAM: mingw32-make