From d49c24f19915add6ffa2065555a4522d4356df82 Mon Sep 17 00:00:00 2001
From: Martin <noone@nowhere.com>
Date: Fri, 9 Mar 2018 21:13:30 +0100
Subject: [PATCH] CircleCI & AppVeyor: Switch to preliminary LDC-LLVM 6.0.0

---
 .circleci/config.yml | 10 +++++-----
 appveyor.yml         | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c41b9c9270c..77dacabb331 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ commonSteps: &commonSteps
             echo "Using LLVM with enabled assertions"
             assertsSuffix="-withAsserts"
           fi
-          curl -L -o llvm.tar.xz https://github.com/ldc-developers/llvm/releases/download/ldc-v$LLVM_VERSION/llvm-$LLVM_VERSION-$CI_OS-x86_64$assertsSuffix.tar.xz
+          curl -L -o llvm.tar.xz https://github.com/ldc-developers/llvm/releases/download/CI/llvm-8d99668b-$CI_OS-x86_64$assertsSuffix-20180309.tar.xz
           tar -xf llvm.tar.xz --strip 1 -C llvm-$LLVM_VERSION
           rm llvm.tar.xz
     - run:
@@ -243,8 +243,8 @@ jobs:
       - image: ubuntu:14.04
     environment:
       - CI_OS: linux
-      - LLVM_VERSION: 5.0.1
-      - HOST_LDC_VERSION: 1.6.0
+      - LLVM_VERSION: 6.0.0
+      - HOST_LDC_VERSION: 1.8.0
       - EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++ -DLDC_INSTALL_LTOPLUGIN=ON -DLDC_INSTALL_LLVM_RUNTIME_LIBS=ON"
       - DUB_VERSION: v1.7.2
   build-osx:
@@ -255,8 +255,8 @@ jobs:
       - CI_OS: osx
       - MACOSX_DEPLOYMENT_TARGET: 10.8
       - USE_LIBCPP: true
-      - LLVM_VERSION: 5.0.1
-      - HOST_LDC_VERSION: 1.6.0
+      - LLVM_VERSION: 6.0.0
+      - HOST_LDC_VERSION: 1.8.0
       - BOOTSTRAP_CMAKE_FLAGS: "-DCMAKE_CXX_FLAGS='-stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS=-lc++"
       - EXTRA_CMAKE_FLAGS: "-DMULTILIB=ON -DCMAKE_CXX_FLAGS='-stdlib=libc++' -DCMAKE_EXE_LINKER_FLAGS=-lc++"
       - DUB_VERSION: v1.7.2
diff --git a/appveyor.yml b/appveyor.yml
index a020895bf7f..a19cae91c2d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,13 +12,13 @@ environment:
   matrix:
     - APPVEYOR_JOB_ARCH:           x64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      LLVM_VERSION:                5.0.1
-      HOST_LDC_VERSION:            1.6.0
+      LLVM_VERSION:                6.0.0
+      HOST_LDC_VERSION:            1.8.0
       DUB_VERSION:                 v1.7.2
     - APPVEYOR_JOB_ARCH:           x86
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      LLVM_VERSION:                5.0.1
-      HOST_LDC_VERSION:            1.6.0
+      LLVM_VERSION:                6.0.0
+      HOST_LDC_VERSION:            1.8.0
       DUB_VERSION:                 v1.7.2
 
 # scripts that are called at very beginning, before repo cloning
@@ -64,15 +64,9 @@ install:
   - ps: |
         If (Test-Path Env:HOST_LDC_VERSION) {
           $ldcVersion = $Env:HOST_LDC_VERSION
-          If ($Env:APPVEYOR_JOB_ARCH -eq 'x64') {
-            appveyor DownloadFile "http://github.com/ldc-developers/ldc/releases/download/v$ldcVersion/ldc2-$ldcVersion-win64-msvc.zip" -FileName ldc2.zip
-            7z x ldc2.zip > $null
-            Set-Item -path env:DMD -value "c:\projects\ldc2-$ldcVersion-win64-msvc\bin\ldmd2.exe"
-          } Else {
-            appveyor DownloadFile "http://github.com/ldc-developers/ldc/releases/download/v$ldcVersion/ldc2-$ldcVersion-win32-msvc.zip" -FileName ldc2.zip
-            7z x ldc2.zip > $null
-            Set-Item -path env:DMD -value "c:\projects\ldc2-$ldcVersion-win32-msvc\bin\ldmd2.exe"
-          }
+          appveyor DownloadFile "http://github.com/ldc-developers/ldc/releases/download/v$ldcVersion/ldc2-$ldcVersion-windows-$Env:APPVEYOR_JOB_ARCH.7z" -FileName ldc2.7z
+          7z x ldc2.7z > $null
+          Set-Item -path env:DMD -value "c:\projects\ldc2-$ldcVersion-windows-$Env:APPVEYOR_JOB_ARCH\bin\ldmd2.exe"
         } Else {
           $dmdVersion = $Env:HOST_DMD_VERSION
           appveyor DownloadFile "http://downloads.dlang.org/releases/2.x/$dmdVersion/dmd.$dmdVersion.windows.7z" -FileName dmd.7z
@@ -94,7 +88,7 @@ install:
           echo 'Using LLVM with enabled assertions'
           $assertsSuffix = '-withAsserts'
         }
-        appveyor DownloadFile "https://github.com/ldc-developers/llvm/releases/download/ldc-v$Env:LLVM_VERSION/llvm-$Env:LLVM_VERSION-windows-$Env:APPVEYOR_JOB_ARCH$assertsSuffix.7z" -FileName llvm.7z
+        appveyor DownloadFile "https://github.com/ldc-developers/llvm/releases/download/CI/llvm-$Env:LLVM_VERSION-windows-$Env:APPVEYOR_JOB_ARCH$assertsSuffix.7z" -FileName llvm.7z
   - md llvm
   - cd llvm
   - 7z x ..\llvm.7z > nul