Skip to content

Commit 85964b0

Browse files
committed
libressl: adapt to fix merged upstream [ci skip]
libressl/portable#987 libressl/portable#989
1 parent a5b7aa1 commit 85964b0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

libressl-cmake.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ _VER="$1"
2525
CPPFLAGS+=' -DNDEBUG'
2626
fi
2727

28-
# LibreSSL (as of v3.8.2) hangs with ASM enabled on Windows ARM64.
29-
if [ "${_OS}" = 'win' ] && [ "${_CPU}" = 'a64' ]; then
30-
options+=' -DENABLE_ASM=OFF'
28+
if [ "${LIBRESSL_VER_}" = '3.8.2' ]; then
29+
# LibreSSL (as of v3.8.2) hangs with ASM enabled on Windows ARM64.
30+
if [ "${_OS}" = 'win' ] && [ "${_CPU}" = 'a64' ]; then
31+
options+=' -DENABLE_ASM=OFF'
32+
fi
3133
fi
3234

3335
if [ "${_CC}" = 'llvm' ]; then

libressl-pkg.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
# SPDX-License-Identifier: MIT
55

66
# Caveats (as of 3.8.2):
7-
# - ARM64 Windows builds exit with an assert and hang with asserts disabled.
8-
# https://github.com/libressl/portable/issues/987
9-
# https://github.com/libressl/portable/pull/989
7+
# - ARM64 Windows builds exit with an assert and hang with asserts disabled. [FIX MERGED]
108
# - CMake builds override -NDEBUG and do not allow building with this option. [FIX MERGED]
119
# - ASM support only for x64.
1210
# - ASM missing Intel CET support, resulting in linker warnings:

0 commit comments

Comments
 (0)