Try a new way to get the right windows debug build.

hylo-lang · Mar 3, 2024 · bab520e · bab520e
1 parent 620fe2f
commit bab520e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.github/workflows/llvm-binaries.yml b/.github/workflows/llvm-binaries.yml
@@ -143,7 +143,7 @@ jobs:
         include:
           # Default values
           - c_compiler: clang
-          - cmake_c_cxx_flags_option:
+          - cmake_msvc_options:
           - cmake_find_root_path_option:
           - cmake_system_processor_option:
           - compile_cache_max_size: 1G
@@ -172,9 +172,7 @@ jobs:
             c_compiler: cl
             # Swift's runtime is compiled this way, and can't be
             # linked to a C++ binary other settings.
-            cmake_c_cxx_flags_option: >-
-              -D "CMAKE_CXX_FLAGS=-D_ITERATOR_DEBUG_LEVEL=0 /MD"
-              -D "CMAKE_C_FLAGS=/MD"
+            cmake_msvc_options: -D CMAKE_CXX_FLAGS=-D_ITERATOR_DEBUG_LEVEL=0 -D CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL
             cxx_compiler: cl
             executable_suffix: .exe
             into_environment: '| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append'
@@ -366,7 +364,7 @@ jobs:
           -D CMAKE_MT=mt
           -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/${{ env.PACKAGE_NAME }}
           ${{ env.cmake_system_name_option }}
-          ${{ matrix.cmake_c_cxx_flags_option }}
+          ${{ matrix.cmake_msvc_options }}
           ${{ matrix.cmake_system_processor_option }}
           -D LLVM_DISTRIBUTION_COMPONENTS="${{ matrix.llvm_backend_libs }};LLVMAggressiveInstCombine;LLVMAnalysis;LLVMAsmParser;LLVMAsmPrinter;LLVMBinaryFormat;LLVMBitReader;LLVMBitWriter;LLVMBitstreamReader;LLVMCFGuard;LLVMCodeGen;LLVMCodeGenTypes;LLVMCore;LLVMCoroutines;LLVMDebugInfoBTF;LLVMDebugInfoCodeView;LLVMDebugInfoDWARF;LLVMDebugInfoMSF;LLVMDebugInfoPDB;LLVMDemangle;LLVMFrontendOpenMP;LLVMGlobalISel;LLVMIRPrinter;LLVMIRReader;LLVMInstCombine;LLVMInstrumentation;LLVMLinker;LLVMMC;LLVMMCA;LLVMMCDisassembler;LLVMMCParser;LLVMObjCARCOpts;LLVMObject;LLVMPasses;LLVMProfileData;LLVMRemarks;LLVMScalarOpts;LLVMSelectionDAG;LLVMSupport;LLVMSymbolize;LLVMTarget;LLVMTargetParser;LLVMTextAPI;LLVMTransformUtils;LLVMVectorize;LLVMipo;llvm-headers;cmake-exports;lld-cmake-exports;${{ matrix.llvm_distribution_tools }}"
           -D LLVM_CONFIG_PATH=${{ github.workspace }}/BinaryCache/0/bin/llvm-config${{ matrix.executable_suffix }}