From 0af09f75173214ffd055d547bef3cab76898048b Mon Sep 17 00:00:00 2001 From: Jay Lee Date: Wed, 16 Apr 2025 20:42:38 -0400 Subject: [PATCH] actions: further fixes for cryptography --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c134dd1..bfb5713e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -323,17 +323,18 @@ jobs: run: | cd "${OPENSSL_SOURCE_PATH}" # install_sw saves us ages processing man pages :-) - $MAKE install_sw - if [[ "${RUNNER_OS}" != "Windows" ]]; then - echo "LDFLAGS=-L${OPENSSL_INSTALL_PATH}/lib" >> $GITHUB_ENV - fi + # $MAKE install_sw + $MAKE install + #if [[ "${RUNNER_OS}" != "Windows" ]]; then + echo "LDFLAGS=-L${OPENSSL_INSTALL_PATH}/lib" >> $GITHUB_ENV + #fi echo "CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1" >> $GITHUB_ENV - case $arch in - x86_64) + case $RUNNER_ARCH in + X64) echo "CFLAGS=-I${OPENSSL_INSTALL_PATH}/include ${CFLAGS}" >> $GITHUB_ENV echo "ARCHFLAGS=-arch x86_64" >> $GITHUB_ENV ;; - aarch64) + ARM64) echo "CFLAGS=-I${OPENSSL_INSTALL_PATH}/include ${CFLAGS}" >> $GITHUB_ENV echo "ARCHFLAGS=-arch arm64" >> $GITHUB_ENV ;;