From a6143759825a257c547a82a490f691b7a0032e36 Mon Sep 17 00:00:00 2001 From: penev92 Date: Sat, 4 Feb 2023 14:01:11 +0200 Subject: [PATCH] Fixed Makefile check of MacOS architecture --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a27a3201fc..4683c422b0 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,7 @@ RM_RF = $(RM) -rf RUNTIME ?= net6 CONFIGURATION ?= Release DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3) +ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64) # Only for use in target version: VERSION := $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || (c=$$(git rev-parse --short HEAD 2>/dev/null) && echo git-$$c)) @@ -68,7 +69,7 @@ ifndef TARGETPLATFORM UNAME_S := $(shell uname -s) UNAME_M := $(shell uname -m) ifeq ($(UNAME_S),Darwin) -ifeq ($(RUNTIME)-$(DOTNET_RID),net6-osx-arm64) +ifeq ($(ARCH_X64),) TARGETPLATFORM = osx-arm64 else TARGETPLATFORM = osx-x64