From a7ec3a85ab231dcce342b9b00d72b06be2f262cf Mon Sep 17 00:00:00 2001
From: Roelf-Jilling <r-j.wolthuis@live.com>
Date: Fri, 16 Nov 2018 17:34:14 +0100
Subject: [PATCH] Revert all since "Workaround: fallback to mscv link.exe" did
 not work on AppVeyor

This reverts the commits:
bda3d6a428e5d19e97375b2e575b0f51ff1b4bc0
97062933acfb6428535c0fdcab5d94371ce72bfc
0f4fb04bac9c2d091005b791294237250dbe0668
1b0c19afd154f4ffc5ef793014c1bc2324534fd0
a5739ea5f0cd7633527b5e5d3b16a9e3ade7149f
---
 appveyor.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index acdaf91..2db7e82 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,8 +18,8 @@ environment:
     #  USE_TOOLSET: MSVC
     #- GSL_CXX_STANDARD: 17
     #  USE_TOOLSET: MSVC
-    #- GSL_CXX_STANDARD: 14
-    #  USE_TOOLSET: LLVM
+    - GSL_CXX_STANDARD: 14
+      USE_TOOLSET: LLVM
     - GSL_CXX_STANDARD: 17
       USE_TOOLSET: LLVM
 
@@ -32,6 +32,7 @@ matrix:
 
 cache:
   - C:\cmake-3.8.0-win32-x86
+  - C:\Tools\vcpkg
 
 install:
   - ps: |
@@ -42,6 +43,15 @@ install:
         }
         $env:PATH="C:\cmake-3.8.0-win32-x86\bin;$env:PATH"
       }
+      # Until vcpkg has been updated.
+      # Note: vcpkg can also be removed from "cache".
+      if ($env:USE_TOOLSET -eq "LLVM" -and
+          (Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020
+      ) {
+        cd C:\Tools\vcpkg
+        git pull
+        cd "$env:APPVEYOR_BUILD_FOLDER"
+      }
 
 before_build:
   - ps: |
@@ -57,19 +67,8 @@ before_build:
       }
       echo generator="$env:generator"
       if ($env:USE_TOOLSET -eq "LLVM") {
-          $COMPILER = "C:\\Program Files\\LLVM\\bin\\clang-cl.exe"
-          $LINKER = "lld-link"
-          # Workaround for lld bug with vcpkg integration
-          if ((Get-Content C:\Tools\vcpkg\toolsrc\VERSION.txt).Replace('.','').Trim('"') -lt 20181020) {
-              echo "Fallback to MSVC linker."
-              cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM% && PATH > path.txt'
-              $env:PATH = (Get-Content .\path.txt).Remove(0,5) # "PATH="
-              $LINKER = "link.exe"
-          } else { echo "==> vcpkg has been updated, please remove the workaround from appvayor.yml." }
-          # /Workaround
           clang-cl --version
-          echo $env:PATH
-          cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER="$COMPILER" -DCMAKE_LINKER="$LINKER"
+          cmake .. -G "$env:generator" -T llvm -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD" -DCMAKE_CXX_COMPILER=clang-cl  -DCMAKE_LINKER=lld-link
       }
       else {
           cmake .. -G "$env:generator" -DGSL_CXX_STANDARD="$env:GSL_CXX_STANDARD"