From 54c12be9ca651be9a349fe9ca524a73d30f87652 Mon Sep 17 00:00:00 2001
From: exquo <62397152+exquo@users.noreply.github.com>
Date: Wed, 21 Aug 2024 12:02:28 +0000
Subject: [PATCH] Restore macos x86_64 target

Github runner macos-latest is now arm64
https://github.com/actions/runner-images/issues/9741
---
 README.md          | 6 ++++--
 generate_matrix.py | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d4e5475..1a9438c 100644
--- a/README.md
+++ b/README.md
@@ -34,10 +34,12 @@ This means that the resulting binaries can be used with confidence that they wer
 - `x86_64-linux-gnu`
 	Most desktop linuxes.
 	Supports `glibc` versions less recent than that required for the upstream releases, which are built on the latest Ubuntu (see [signal-cli#643](https://github.com/AsamK/signal-cli/issues/643)).
-- `aarch64-apple-darwin`
-	MacOS, ARM64.
 - `x86_64-pc-windows`
 	Windows, 64 bit.
+- `x86_64-apple-darwin`
+   MacOS, Intel 64 bit.
+- `aarch64-apple-darwin`
+	MacOS, ARM64.
 - `aarch64-linux-gnu`
 	Raspberry Pi 3,4; Pine A64; many SoC.
 - `armv7-linux-gnueabihf`
diff --git a/generate_matrix.py b/generate_matrix.py
index 18eb88c..d8836e7 100644
--- a/generate_matrix.py
+++ b/generate_matrix.py
@@ -59,9 +59,10 @@
                 },
         "macos": {
                 "runner": "macos-latest",
+                "triple": "aarch64-apple-darwin",
+                    # macos-latest is arm64: https://github.com/actions/runner-images
                 "lib-prefix": "lib",
                 "lib-suffix": ".dylib",
-                "triple": "x86_64-apple-darwin",
                 "install-cmd": "brew install",
                 "req-pkg": "protobuf",
             },
@@ -106,7 +107,8 @@ def cross_template(arch, subarch="", env="gnu", vendor="unknown", sys_os="linux"
         cross_template("aarch64"),
         cross_template("arm", "v7", "gnueabihf"),
         cross_template("i686"),
-        hosts["macos"] | {"target": "aarch64-apple-darwin"},
+        hosts["macos"],
+        hosts["macos"] | {"target": "x86_64-apple-darwin"},
         hosts["windows"],
         ]