From 36e4fb2f8f6e9a878d2fd94d9e33197b3e2f0e8c Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Thu, 23 Sep 2021 09:38:38 -0400
Subject: [PATCH] crosscompile to amd64 when building on darwin/arm64

---
 Makefile                 | 11 +++++++++++
 vendor/QR-Code-generator |  2 +-
 vendor/status-go         |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 30d93a8463..bfcebf65ce 100644
--- a/Makefile
+++ b/Makefile
@@ -162,6 +162,17 @@ else
 endif
 DOTHERSIDE_BUILD_CMD := cmake --build . --config Release $(HANDLE_OUTPUT)
 
+
+
+ifeq ($(detected_OS),Darwin)
+  ifeq ("$(shell sysctl -nq hw.optional.arm64)","1")
+    # Building on M1 is still not supported, so in the meantime we crosscompile to amd64
+    DOTHERSIDE_CMAKE_PARAMS += -DCMAKE_OSX_ARCHITECTURES=x86_64
+	NIM_PARAMS += --cpu:amd64 --os:MacOSX --passL:"-arch x86_64" --passC:"-arch x86_64"
+  endif
+endif
+
+
 RELEASE ?= false
 ifeq ($(RELEASE),false)
  # We need `-d:debug` to get Nim's default stack traces
diff --git a/vendor/QR-Code-generator b/vendor/QR-Code-generator
index d2283a645c..1bcbf53e63 160000
--- a/vendor/QR-Code-generator
+++ b/vendor/QR-Code-generator
@@ -1 +1 @@
-Subproject commit d2283a645c50b13699b8a51aef3420c383fbbb4e
+Subproject commit 1bcbf53e6370580aacd43c0e95bf32829d55208b
diff --git a/vendor/status-go b/vendor/status-go
index 3b05d379bd..3fd89495b9 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit 3b05d379bde2e58b9fc0c3664a37e43a39edcff1
+Subproject commit 3fd89495b97a8c1c98d8c69ad6bdb9e76f4949fb