Change Appveyor to download Clang from llvm.org instead of my private server

llvm-svn: 302181

diff --git a/libcxx/appveyor.yml b/libcxx/appveyor.yml
index 4c9dbd4..1d9e88a 100644 (file)
--- a/libcxx/appveyor.yml
+++ b/libcxx/appveyor.yml
@@ -65,4 +65,4 @@ artifacts:
 cache:
  - C:\projects\deps\ninja
  - C:\projects\deps\cmake
- - C:\projects\deps\llvm
+ - C:\projects\deps\llvm-installer.exe

diff --git a/libcxx/install-appveyor-reqs.cmd b/libcxx/install-appveyor-reqs.cmd
index e2b9f23..ebd72ca 100644 (file)
--- a/libcxx/install-appveyor-reqs.cmd
+++ b/libcxx/install-appveyor-reqs.cmd
@@ -7,11 +7,11 @@ cd C:\projects\deps
 ::###########################################################################
 :: Setup the path to Clang-cl
 ::###########################################################################
+if NOT EXIST llvm-installer.exe (
+  appveyor DownloadFile http://llvm.org/pre-releases/win-snapshots/LLVM-5.0.0-r301646-win32.exe -FileName llvm-installer.exe
+)
 if "%CLANG_VERSION%"=="ToT" (
-    appveyor DownloadFile http://efcs.ca/downloads/llvm-tot-win32.zip -FileName llvm-package.zip
-    move "C:\Program Files\LLVM" "C:\Program Files\LLVM_BAK"
-    7z x llvm-package.zip -o"C:\Program Files\LLVM" > nul
-    rm llvm-package.zip
+    START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
 )
 @set PATH="C:\Program Files\LLVM\bin";%PATH%
 clang-cl -v
@@ -42,10 +42,6 @@ ninja --version
 ::###########################################################################
 :: Setup the cached copy of LLVM
 ::###########################################################################
-if NOT EXIST llvm (
-  git clone --depth=1 http://llvm.org/git/llvm.git
-) ELSE (
-  git -C llvm pull --rebase=true --ff-only
-)
+git clone --depth=1 http://llvm.org/git/llvm.git
 
 @echo off