From 11bfe735d84ebeedc9ac53d3412c43e8f918f70d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 11 Jul 2025 17:28:27 +1100 Subject: [PATCH 1/2] Revert "disable mingw C++ tests" This reverts commit 1debd07fc3a4b20cbfb7197d035ac5f67685cdb7. --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index daa980f6..288900b9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -472,7 +472,7 @@ outputs: test: requires: - {{ compiler("cxx") }} - # - gxx_impl_{{ target_platform }} # [win64] + - gxx_impl_{{ target_platform }} # [win64] files: - mytest.cxx commands: @@ -482,7 +482,7 @@ outputs: - unset CONDA_BUILD_SYSROOT # [unix] - set "CONDA_BUILD_SYSROOT=" # [win] - clang++ -v -c mytest.cxx - # - clang++ -v mytest.cxx --target=x86_64-w64-mingw32 # [win64] + - clang++ -v mytest.cxx --target=x86_64-w64-mingw32 # [win64] - name: clang-format-{{ major_version }} script: install_clang_format.sh # [unix] From cb0d977133392032f000cd3e945caa277143563b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 19 Jul 2025 17:08:58 +1100 Subject: [PATCH 2/2] avoid picking up clang++.exe from image --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 288900b9..2567de60 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -476,6 +476,8 @@ outputs: files: - mytest.cxx commands: + # avoid CMake picking up random clang in image when using unactivated compilers + - del /s /q "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\x64\bin\clang++.exe" # [win] - clang++ --version - clang++-{{ major_version }} --version - clang++ -v -c mytest.cxx