Commit c62ae80b1a for openssl.org
commit c62ae80b1a9bbf5af6993a3f65df2b9931db3101
Author: Richard Levitte <levitte@openssl.foundation>
Date: Tue Nov 17 16:07:51 2026 +0100
cmake config test: match the consumer CRT to a no-shared build
A no-shared OpenSSL build links its binaries against the static CRT,
but the cmake-built dummies defaulted to /MD, importing msvcr*.dll at
load time. The vs2013 CI container carries the CRT only beside the
x86-hosted tools, so an x64 dummy cannot start there.
Assisted-by: Pi:moonshotai/kimi-k3
Signed-off-by: Richard Levitte <levitte@openssl.foundation>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Merge-date: Thu Nov 19 10:10:03 2026
Merged-from: https://github.com/openssl/openssl/pull/33796
diff --git a/test/recipes/94-test_cmake_config.t b/test/recipes/94-test_cmake_config.t
index 006b90fd62..35e081ffc6 100644
--- a/test/recipes/94-test_cmake_config.t
+++ b/test/recipes/94-test_cmake_config.t
@@ -94,6 +94,13 @@ push @cmake_configure, "-A", "Win32"
push @cmake_configure, "-A", "ARM64"
if config('target') =~ /^VC-WIN64-ARM/ && $platform_flag_ok;
+# A no-shared OpenSSL build links against the static CRT (Configurations
+# sets /MT for that case); the dummy programs must use the same runtime,
+# or they import msvcr*.dll, which a minimal toolchain environment need
+# not carry.
+push @cmake_configure, "-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded"
+ if config('target') =~ /^VC-/ && disabled("shared");
+
# With Unix generators, cmake compiles the consumer project with the
# host compiler's default word size, which may deviate from the OpenSSL
# build's (e.g. linux-x86 on an x86_64 host). Translate the word size