From 8f79259538b9f3ee182b8dc73b680fa57406adc8 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Wed, 16 Oct 2024 02:00:34 +0200
Subject: [PATCH] libressl needs ASM settings now

---
 _build.sh   | 2 ++
 libressl.sh | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_build.sh b/_build.sh
index f2f2e3723..6f6928397 100755
--- a/_build.sh
+++ b/_build.sh
@@ -790,6 +790,7 @@ build_single_target() {
   export _LDFLAGS_CXX_GLOBAL=''  # CMake uses this
   export _CMAKE_GLOBAL='-Wno-dev'  # Suppress CMake warnings meant for upstream developers
   export _CMAKE_CXX_GLOBAL=''
+  export _CMAKE_ASM_GLOBAL=''
   export _CROSS=0
 
   if [[ "${_CONFIG}" =~ (small|zero) ]]; then
@@ -1281,6 +1282,7 @@ build_single_target() {
 
   _CMAKE_GLOBAL+=" -DCMAKE_C_COMPILER_TARGET=${_TRIPLET}"
   _CMAKE_CXX_GLOBAL+=" -DCMAKE_CXX_COMPILER_TARGET=${_TRIPLET}"
+  _CMAKE_ASM_GLOBAL+=" -DCMAKE_ASM_COMPILER_TARGET=${_TRIPLET}"
 
   # Needed to exclude compiler info from objects, but for our Windows COFF
   # outputs this seems to be a no-op as of llvm/clang 13.x/14.x.
diff --git a/libressl.sh b/libressl.sh
index 710c0c926..7a51e89be 100755
--- a/libressl.sh
+++ b/libressl.sh
@@ -71,11 +71,12 @@ _VER="$1"
   fi
 
   # shellcheck disable=SC2086
-  cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${options} \
+  cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_ASM_GLOBAL} ${options} \
     '-DBUILD_SHARED_LIBS=OFF' \
     '-DLIBRESSL_APPS=OFF' \
     '-DLIBRESSL_TESTS=OFF' \
-    "-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
+    "-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}" \
+    "-DCMAKE_ASM_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL}"
 
   make --directory="${_BLDDIR}" --jobs="${_JOBS}" install "DESTDIR=$(pwd)/${_PKGDIR}"