From b473189aede83b4f6ab925ce9f0ee7914fd249c3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 01:04:24 +0000 Subject: [PATCH 1/2] Initial plan From 2bf9c831f1ef9b9de59a712c7e2b4ac00ba3ad8d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 12 Apr 2026 01:07:35 +0000 Subject: [PATCH 2/2] Fix Issue #72: use target arch from context in afterPack to fix Intel Mac binary not found Agent-Logs-Url: https://github.com/modstart-lib/linkandroid/sessions/8a7ddead-8b22-4a7d-aedc-a0f4445d22c6 Co-authored-by: modstart <78841409+modstart@users.noreply.github.com> --- scripts/build_optimize.cjs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/build_optimize.cjs b/scripts/build_optimize.cjs index bddadf1a..c003e84b 100644 --- a/scripts/build_optimize.cjs +++ b/scripts/build_optimize.cjs @@ -1,5 +1,17 @@ const common = require("./common.cjs"); +// electron-builder Arch enum values +const ARCH_X64 = 1; +const ARCH_ARM64 = 3; + +const archFromContext = (contextArch) => { + switch (contextArch) { + case ARCH_X64: return "x86"; // x64 -> x86 (matches directory naming convention) + case ARCH_ARM64: return "arm64"; + default: return common.platformArch(); + } +}; + console.log("BuildOptimize", { name: common.platformName(), arch: common.platformArch(), @@ -12,7 +24,9 @@ exports.default = async function (context) { }); // copy extra electron/resources/extra/[name]-[arch] to extra const platformName = common.platformName(); - const platformArch = common.platformArch(); + // Use target architecture from context to support cross-arch builds + // (e.g. building x64 and arm64 on the same ARM64 machine) + const platformArch = archFromContext(context.arch); const name = platformName + "-" + platformArch; const srcDir = `electron/resources/extra/${name}`;