Commit 6a13694120 for openssl.org
commit 6a13694120528cc4a1fa20ea150475edc2887a30
Author: Norbert Pocs <norbertp@openssl.org>
Date: Thu Sep 17 16:51:56 2026 +0200
Add windows arm64 hybridcrt config
Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Merge-date: Wed Sep 23 09:28:51 2026
Merged-from: https://github.com/openssl/openssl/pull/32882
diff --git a/Configurations/50-win-hybridcrt.conf b/Configurations/50-win-hybridcrt.conf
index 242583c728..ddd4636a62 100644
--- a/Configurations/50-win-hybridcrt.conf
+++ b/Configurations/50-win-hybridcrt.conf
@@ -34,4 +34,13 @@ my %targets = (
lflags => add(picker(debug => "/NODEFAULTLIB:libucrtd.lib /DEFAULTLIB:ucrtd.lib",
release => "/NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")),
},
+ "VC-WIN64-ARM-HYBRIDCRT" => {
+ inherit_from => [ "VC-WIN64-ARM" ],
+ cflags => sub {
+ remove_from_flags(qr/\/MDd?\s/, add(picker(debug => "/MTd",
+ release => "/MT"))->(@_))
+ },
+ lflags => add(picker(debug => "/NODEFAULTLIB:libucrtd.lib /DEFAULTLIB:ucrtd.lib",
+ release => "/NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib")),
+ },
);
diff --git a/NOTES-WINDOWS.md b/NOTES-WINDOWS.md
index 76371e529d..a7889cd3d2 100644
--- a/NOTES-WINDOWS.md
+++ b/NOTES-WINDOWS.md
@@ -87,6 +87,8 @@ Quick start
on the Universal CRT or
- `perl Configure VC-WIN64A-HYBRIDCRT` if you want 64-bit OpenSSL dependent
on the Universal CRT or
+ - `perl Configure VC-WIN64-ARM-HYBRIDCRT` if you want Windows on Arm
+ (win-arm64) OpenSSL dependent on the Universal CRT or
- `perl Configure` to let Configure figure out the platform
a. If you don't plan to develop OpenSSL yourself and don't need to rebuild,