monster/RECORDANDRONCO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Makefile check of MacOS architecture

Browse Source 
From OpenRA PR 20651.
This commit is contained in:
penev92 2023-02-20 09:29:30 +02:00 committed by Paul Chote
parent 2187e3fc91
commit 5d469bd0d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -56,12 +56,13 @@ DOTNET = dotnet
RUNTIME ?= net6 RUNTIME ?= net6
CONFIGURATION ?= Release CONFIGURATION ?= Release
DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3) DOTNET_RID = $(shell ${DOTNET} --info | grep RID: | cut -w -f3)
ARCH_X64 = $(shell echo ${DOTNET_RID} | grep x64)
ifndef TARGETPLATFORM ifndef TARGETPLATFORM
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
UNAME_M := $(shell uname -m) UNAME_M := $(shell uname -m)
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
ifeq ($(RUNTIME)-$(DOTNET_RID),net6-osx-arm64) ifeq ($(ARCH_X64),)
TARGETPLATFORM = osx-arm64 TARGETPLATFORM = osx-arm64
else else
TARGETPLATFORM = osx-x64 TARGETPLATFORM = osx-x64