From 2b245a4baf85eac1c1df533e0cb576f90bb2d59b Mon Sep 17 00:00:00 2001 From: Luke Street Date: Thu, 25 Jun 2020 20:17:25 -0400 Subject: [PATCH] AppVeyor: Use clang-cl again (MSVC 16.6.2 is broken) --- .appveyor.yml | 7 ++++++- README.md | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a22d7a484..73315b548 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,6 +53,10 @@ before_build: # Configure cmake - set PATH=C:\projects\deps\cmake\cmake-3.16.4-win64-x64\bin;%PATH% - cmake --version + # Configure LLVM + - set PATH=C:\projects\deps\llvm\bin;%PATH% + - llvm-config --version + - clang-cl -v # Configure VS - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" amd64 # Fetch submodules @@ -62,7 +66,8 @@ before_build: build_script: - mkdir build - cd build - - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DLLVM_ROOT_DIR=C:\projects\deps\llvm -DCMAKE_CXX_FLAGS= -DCMAKE_C_FLAGS= -GNinja .. + # -DCMAKE_LINKER=lld-link -DCMAKE_AR=llvm-ar -DCMAKE_RANLIB=llvm-ranlib + - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DLLVM_ROOT_DIR=C:\projects\deps\llvm -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -GNinja .. - ninja urde #notifications: diff --git a/README.md b/README.md index 4525d5e6b..fd9bc961f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Everything else is much too experimental to make portable/stable release builds * Verify it's added to `%PATH%` by typing `python` in `cmd`. * macOS: `brew install python@3` * LLVM development package *(headers and libs)* - * [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64.exe) + * [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64-lld.exe) * macOS: `brew install --force-bottle llvm` * **[Windows]** [Visual Studio 2019 Community](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx) * Select `C++ Development` and verify the following packages are included: