From aca8e4203395bba85db3ec324310765ed0df760e Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 31 Dec 2017 17:21:35 -0800 Subject: [PATCH] Use --bundled-clang=5.0.1 in appveyor (#212) --- .appveyor.yml | 8 ++++---- src/platform_win.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index abcf41e7..5c138b94 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,9 +15,9 @@ build_script: $dir = "cquery-${env:appveyor_build_version}-win64" cd C:\projects\cquery mkdir "${dir}\build\release\bin" -ea 0 - mkdir "${dir}\build\release\lib\LLVM-4.0.0-win64\lib\clang\4.0.0\" + mkdir "${dir}\build\release\lib\LLVM-5.0.1-win64\lib\clang\5.0.1\" copy "build\release\bin\*" "${dir}\build\release\bin" - copy -recurse "build\LLVM-4.0.0-win64\lib\clang\4.0.0\include" "${dir}\build\release\lib\LLVM-4.0.0-win64\lib\clang\4.0.0\" + copy -recurse "build\LLVM-5.0.1-win64\lib\clang\5.0.1\include" "${dir}\build\release\lib\LLVM-5.0.1-win64\lib\clang\5.0.1\" 7z a -tzip "C:\projects\cquery\${dir}.zip" "${dir}" - build\release\bin\cquery --log-all-to-stderr --test-unit - build\release\bin\cquery --log-all-to-stderr --test-index @@ -27,6 +27,6 @@ artifacts: cache: - C:\projects\cquery\build\LLVM-4.0.0-win64.exe - - C:\projects\cquery\build\LLVM-5.0.0-win64.exe + - C:\projects\cquery\build\LLVM-5.0.1-win64.exe - C:\projects\cquery\build\LLVM-4.0.0-win64\ - - C:\projects\cquery\build\LLVM-5.0.0-win64\ + - C:\projects\cquery\build\LLVM-5.0.1-win64\ diff --git a/src/platform_win.cc b/src/platform_win.cc index 0e7f406a..7db30d87 100644 --- a/src/platform_win.cc +++ b/src/platform_win.cc @@ -243,7 +243,7 @@ std::vector GetPlatformClangArguments() { "-isystem","C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK/Include", "-isystem","C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.10.25017/include", "-isystem","C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt", - "-isystem","C:/Program Files/LLVM/lib/clang/4.0.0/include", + "-isystem","C:/Program Files/LLVM/lib/clang/5.0.1/include", "-fms-extensions", "-fms-compatibility", "-fms-compatibility-version=18", "-fdelayed-template-parsing" }; // clang-format on