Use LLVM 18 by default. Update MSVC to LLVM 18.1.8.

This commit is contained in:
Christoffer Lerno
2024-07-04 00:48:35 +02:00
parent 12051e7544
commit 4a50de8318
2 changed files with 5 additions and 5 deletions

View File

@@ -7,7 +7,7 @@ on:
branches: [ master ] branches: [ master ]
env: env:
LLVM_RELEASE_VERSION: 16 LLVM_RELEASE_VERSION: 18
jobs: jobs:
@@ -446,7 +446,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
build_type: [Release, Debug] build_type: [Release, Debug]
llvm_version: [15, 16, 17] llvm_version: [15, 16, 17, 18]
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download LLVM - name: Download LLVM

View File

@@ -98,15 +98,15 @@ endif()
if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
if (C3_LLVM_VERSION STREQUAL "auto") if (C3_LLVM_VERSION STREQUAL "auto")
set(C3_LLVM_VERSION "16") set(C3_LLVM_VERSION "18")
endif() endif()
FetchContent_Declare( FetchContent_Declare(
LLVM_Windows LLVM_Windows
URL https://github.com/c3lang/win-llvm/releases/download/llvm_16_0_2/llvm-16.0.2-windows-amd64-msvc17-libcmt.7z URL https://github.com/c3lang/win-llvm/releases/download/llvm_18_1_8/llvm-18.1.8-windows-amd64-msvc17-libcmt.7z
) )
FetchContent_Declare( FetchContent_Declare(
LLVM_Windows_debug LLVM_Windows_debug
URL https://github.com/c3lang/win-llvm/releases/download/llvm_16_0_2/llvm-16.0.2-windows-amd64-msvc17-libcmt-dbg.7z URL https://github.com/c3lang/win-llvm/releases/download/llvm_18_1_8/llvm-18.1.8-windows-amd64-msvc17-libcmt-dbg.7z
) )
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")
message("Loading Windows LLVM debug libraries, this may take a while...") message("Loading Windows LLVM debug libraries, this may take a while...")