From 62a2a1231a02bbef665aea9f457d0e9593332cf4 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sat, 14 Jun 2025 17:23:32 +1200
Subject: [PATCH] 'Generic Commit'

---
 Dockerfile.dropshell-build | 9 ++++++++-
 src/assert.hpp             | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.dropshell-build b/Dockerfile.dropshell-build
index 3d9aa97..76b4cc8 100644
--- a/Dockerfile.dropshell-build
+++ b/Dockerfile.dropshell-build
@@ -16,10 +16,15 @@ ENV CCACHE_MAXSIZE=2G
 
 COPY . .
 
+# Multi-architecture OpenSSL detection handled in cmake step
+
 # Configure and build with ccache using cache mounts
 RUN --mount=type=cache,target=/ccache \
     --mount=type=cache,target=/build \
     mkdir -p /build && \
+    SSL_LIB=$(find /usr/local -name "libssl.a" | head -1) && \
+    CRYPTO_LIB=$(find /usr/local -name "libcrypto.a" | head -1) && \
+    echo "Found SSL: $SSL_LIB, Crypto: $CRYPTO_LIB" && \
     cmake -G Ninja -S /app -B /build \
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -35,7 +40,9 @@ RUN --mount=type=cache,target=/ccache \
     -DCMAKE_STRIP=OFF \
     -DIGNORE_DYNAMIC_LOADING=ON \
     -DOPENSSL_ROOT_DIR=/usr/local \
-    -DOPENSSL_LIBRARIES="/usr/local/lib64/libssl.a;/usr/local/lib64/libcrypto.a" \
+    -DOPENSSL_USE_STATIC_LIBS=TRUE \
+    -DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
+    -DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
     -DOPENSSL_INCLUDE_DIR=/usr/local/include \
     ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
 
diff --git a/src/assert.hpp b/src/assert.hpp
index a80a7fe..016dba6 100644
--- a/src/assert.hpp
+++ b/src/assert.hpp
@@ -169,6 +169,9 @@ void assert_failed(
     std::source_location location
 ) {
     if (!condition) {
+        std::cout << std::flush;
+        std::cerr << std::flush;
+
         std::cerr << colors::red << "Assertion failed at " << location.file_name() << ":" << location.line() << ": " 
                   << location.function_name() << ": " << message << colors::reset << "\n";
         print_stacktrace();