From 8ac2490ae5cc8e451d77c6b37fc9056f6f83af44 Mon Sep 17 00:00:00 2001
From: Stephen <stephengroat@users.noreply.github.com>
Date: Mon, 6 Feb 2017 13:11:42 -0800
Subject: [PATCH] add clang and gcc specifically

---
 .appveyor.yml | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 93a57678d..bb39dd636 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,26 +1,44 @@
 environment:
     CYG_MIRROR: http://cygwin.mirror.constant.com
-    CYG_PACKAGES: make,gcc-core,clang,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core
+    CYG_PACKAGES: make,gcc-core,clang
     matrix:
         - MSYSTEM: MINGW64
           BASH: C:\msys64\usr\bin\bash
           MSYS_CACHE: C:\msys64\var\cache\pacman\pkg
+          CC: gcc
         - MSYSTEM: MINGW32
           BASH: C:\msys64\usr\bin\bash
           MSYS_CACHE: C:\msys64\var\cache\pacman\pkg
+          CC: gcc
         - CYG_ROOT: C:\cygwin64
           CYG_CACHE: C:\cygwin64\var\cache\setup
           CYG_SETUP: setup-x86_64.exe
           BASH: C:\cygwin64\bin\bash
+          CC: gcc
         - CYG_ROOT: C:\cygwin
           CYG_CACHE: C:\cygwin\var\cache\setup
           CYG_SETUP: setup-x86.exe
           BASH: C:\cygwin\bin\bash
+          CC: gcc
+        - MSYSTEM: MINGW64
+          BASH: C:\msys64\usr\bin\bash
+          MSYS_CACHE: C:\msys64\var\cache\pacman\pkg
+          CC: clang
+        - MSYSTEM: MINGW32
+          BASH: C:\msys64\usr\bin\bash
+          MSYS_CACHE: C:\msys64\var\cache\pacman\pkg
+          CC: clang
+        - CYG_ROOT: C:\cygwin64
+          CYG_CACHE: C:\cygwin64\var\cache\setup
+          CYG_SETUP: setup-x86_64.exe
+          BASH: C:\cygwin64\bin\bash
+          CC: clang
+        - CYG_ROOT: C:\cygwin
+          CYG_CACHE: C:\cygwin\var\cache\setup
+          CYG_SETUP: setup-x86.exe
+          BASH: C:\cygwin\bin\bash
+          CC: clang
 
-# Cache Cygwin/MSYS files to speed up build
-cache:
-    - '%CYG_CACHE%'
-    - '%MSYS_CACHE%'
 clone_depth: 1
 
 # Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
@@ -36,7 +54,7 @@ install:
     - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
     - if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
 build_script:
-    - if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule init && git submodule update && make")
+    - %BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && git submodule init && git submodule update && make"
 # Allows RDP
 #on_finish:
 #    - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))