From 410959023d6b91cedc27a720c4938a33ddade021 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Mon, 16 Sep 2024 10:21:43 +0100 Subject: [PATCH] Use CMAKE_MSVC_RUNTIME_LIBRARY to select BoringSSL C runtime. Fixes CI on Windows. Unsure exactly what triggered it upstream but without this, cmake starting adding /MD to the cflags and overriding ours, causing link errors. Switching Conscrypt to /MT causes runtime crashes. This fix seems better than setting the flags directly anyway. Maybe worth upstreaming as the default unless there are use cases for CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL --- .github/workflows/ci.yml | 2 +- BUILDING.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82f57cc0c..49ff88db0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -140,7 +140,7 @@ jobs: & $Env:GITHUB_WORKSPACE\.github\workflows\vsenv.ps1 -arch x64 -hostArch x64 mkdir build64 pushd build64 - cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE=/MT -DCMAKE_CXX_FLAGS_RELEASE=/MT -GNinja .. + cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -GNinja .. ninja popd diff --git a/BUILDING.md b/BUILDING.md index 952abf4fd..7ac7f8e98 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -110,8 +110,7 @@ mkdir build64 cd build64 cmake -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE ^ -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_C_FLAGS_RELEASE=/MT ^ - -DCMAKE_CXX_FLAGS_RELEASE=/MT ^ + -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded ^ -GNinja .. ninja ```