status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

crosscompile to amd64 when building on darwin/arm64

This commit is contained in:
Richard Ramos 2021-09-23 09:38:38 -04:00 committed by Iuri Matias
parent 85250211ea
commit 36e4fb2f8f
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -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

2
vendor/QR-Code-generator vendored

@ -1 +1 @@
Subproject commit d2283a645c50b13699b8a51aef3420c383fbbb4e
Subproject commit 1bcbf53e6370580aacd43c0e95bf32829d55208b

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 3b05d379bde2e58b9fc0c3664a37e43a39edcff1
Subproject commit 3fd89495b97a8c1c98d8c69ad6bdb9e76f4949fb