From 197f82d82995639586aa063bbf62d4add592df1c Mon Sep 17 00:00:00 2001 From: Christoffer Lerno Date: Wed, 7 Jan 2026 03:36:48 +0100 Subject: [PATCH] Revert windows --- .github/workflows/main.yml | 2 +- CMakeLists.txt | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 014e277f8..593e99611 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ on: branches: [ master, dev ] env: - LLVM_RELEASE_VERSION_WINDOWS: 21 + LLVM_RELEASE_VERSION_WINDOWS: 18 LLVM_RELEASE_VERSION_MAC: 18 LLVM_RELEASE_VERSION_LINUX: 19 LLVM_RELEASE_VERSION_OPENBSD: 19 diff --git a/CMakeLists.txt b/CMakeLists.txt index f144a8169..922676abe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20) set(C3_LLVM_MIN_VERSION 17) set(C3_LLVM_MAX_VERSION 22) -set(C3_LLVM_DEFAULT_VERSION 21) +set(C3_LLVM_DEFAULT_VERSION 19) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) message(FATAL_ERROR "In-tree build detected, please build in a separate directory") @@ -57,7 +57,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 17) # Use /MT or /MTd -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded") +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") if(MSVC) message(STATUS "MSVC version ${MSVC_VERSION}") @@ -142,11 +142,11 @@ if(C3_WITH_LLVM) endif() FetchContent_Declare( LLVM_Windows - URL https://github.com/c3lang/win-llvm/releases/download/llvm_21_1_8/llvm-21.1.8-windows-amd64-msvc17-libcmt.7z + URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt.7z ) FetchContent_Declare( LLVM_Windows_debug - URL https://github.com/c3lang/win-llvm/releases/download/llvm_21_1_8/llvm-21.1.8-windows-amd64-msvc17-libcmt-dbg.7z + URL https://github.com/c3lang/win-llvm/releases/download/llvm_19_1_5/llvm-19.1.5-windows-amd64-msvc17-libcmt-dbg.7z ) if(CMAKE_BUILD_TYPE STREQUAL "Debug") message("Loading Windows LLVM debug libraries, this may take a while...") @@ -435,7 +435,9 @@ if(C3_WITH_LLVM) target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=1) add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp) if (MSVC) - target_compile_options(c3c PRIVATE "/EHsc") + target_compile_options(c3c PRIVATE + "$<$:/EHa>" + "$<$:/EHsc>") endif() else() target_sources(c3c PRIVATE src/utils/hostinfo.c)