Attempt to setup MSVC 2017

llvm-svn: 302101

diff --git a/libcxx/appveyor.yml b/libcxx/appveyor.yml
index 663db2b..c11e93d 100644 (file)
--- a/libcxx/appveyor.yml
+++ b/libcxx/appveyor.yml
@@ -2,9 +2,6 @@ version: '{build}'
 
 shallow_clone: true
 
-os:
-  - Visual Studio 2015
-
 build:
   verbosity: detailed
 
@@ -13,7 +10,12 @@ configuration:
 
 environment:
   matrix:
-    - COMPILER: Clang-CL 4.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      COMPILER: Clang-CL 4.0
+      MSVC_SETUP_PATH: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      COMPILER: Clang-CL 4.0
+      MSVC_SETUP_PATH: "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
 
 install:
   ############################################################################
@@ -54,7 +56,7 @@ install:
 
 
 before_build:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  - call "$MSVC_SETUP_PATH" amd64
   - cd C:\projects\libcxx
 
 build_script: