Skip to content

Commit 5d469bd

Browse files
penev92pchote
authored andcommitted
Fixed Makefile check of MacOS architecture
From OpenRA PR 20651.
1 parent 2187e3f commit 5d469bd

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ DOTNET = dotnet
5656
RUNTIME ?= net6
5757
CONFIGURATION ?= Release
5858
DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
59+
ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64)
5960

6061
ifndef TARGETPLATFORM
6162
UNAME_S := $(shell uname -s)
6263
UNAME_M := $(shell uname -m)
6364
ifeq ($(UNAME_S),Darwin)
64-
ifeq ($(RUNTIME)-$(DOTNET_RID),net6-osx-arm64)
65+
ifeq ($(ARCH_X64),)
6566
TARGETPLATFORM = osx-arm64
6667
else
6768
TARGETPLATFORM = osx-x64

0 commit comments

Comments
 (0)