From d92c2efc22b3cba79cd4e2c0b9794a2c4ecd75eb Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 30 Apr 2026 12:39:20 -0500 Subject: [PATCH] fix(build): adjust macOS build process to ensure compatibility with x86_64 architecture using Rosetta --- .github/workflows/build-release.yml | 9 +++++---- scripts/build-backend.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index acc2ce4..582980b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -366,12 +366,13 @@ jobs: if: matrix.label == 'macos' env: PY_X64: ${{ steps.python_x64.outputs.python-path }} + ARCHFLAGS: "-arch x86_64" run: | set -euo pipefail - "$PY_X64" -m pip install -U pip setuptools wheel - "$PY_X64" -m pip install "cx-freeze>=7.0.0" - "$PY_X64" -m pip install -e . - "$PY_X64" scripts/patch_lxst_pyogg_ogg_ctypes.py + arch -x86_64 "$PY_X64" -m pip install -U pip setuptools wheel + arch -x86_64 "$PY_X64" -m pip install "cx-freeze>=7.0.0" + arch -x86_64 "$PY_X64" -m pip install -e . + arch -x86_64 "$PY_X64" scripts/patch_lxst_pyogg_ogg_ctypes.py - name: Download frontend artifact uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 diff --git a/scripts/build-backend.js b/scripts/build-backend.js index 451d811..53ec007 100755 --- a/scripts/build-backend.js +++ b/scripts/build-backend.js @@ -233,7 +233,7 @@ try { let spawnCmd = cmd; let spawnArgs = licensesArgs; - const rosettaX64 = isDarwin && arch === "x64" && process.arch === "arm64" && !process.env.PYTHON_CMD; + const rosettaX64 = isDarwin && arch === "x64" && process.arch === "arm64"; if (rosettaX64) { spawnCmd = "arch"; spawnArgs = ["-x86_64", cmd, ...licensesArgs];