diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6767a1c4..b25f887d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -255,11 +255,9 @@ jobs: if [[ "$RUNNER_ARCH" == "ARM64" ]]; then PYEXTERNALS_PATH="arm64" WIX_ARCH="arm64" - CHOC_OPS="" elif [[ "$RUNNER_ARCH" == "X64" ]]; then PYEXTERNALS_PATH="amd64" WIX_ARCH="x64" - CHOC_OPS="" fi LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}" echo "PYTHON=${PYTHON_SOURCE_PATH}/PCbuild/${PYEXTERNALS_PATH}/python.exe" >> $GITHUB_ENV @@ -294,8 +292,8 @@ jobs: if: matrix.goal == 'build' && steps.cache-python-ssl.outputs.cache-hit != 'true' run: | cd "${OPENSSL_SOURCE_PATH}" - # TODO: remove this once https://github.com/openssl/openssl/issues/26239 is fixed. if ([ "$RUNNER_OS" == "Windows" ] && [ "$RUNNER_ARCH" == "ARM64" ]); then + # https://github.com/openssl/openssl/issues/26239 export CFLAGS=-DNO_INTERLOCKEDOR64 fi # --libdir=lib is needed so Python can find OpenSSL libraries