From 5d469bd0d870384eabebb76d26d8b3910a7d7559 Mon Sep 17 00:00:00 2001 From: penev92 Date: Mon, 20 Feb 2023 09:29:30 +0200 Subject: [PATCH] Fixed Makefile check of MacOS architecture From OpenRA PR 20651. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2b25059..7dbd192 100644 --- a/Makefile +++ b/Makefile @@ -56,12 +56,13 @@ DOTNET = dotnet RUNTIME ?= net6 CONFIGURATION ?= Release DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3) +ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64) 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