epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Makefile check of MacOS architecture

Browse Source
This commit is contained in:
penev92
2023-02-04 14:01:11 +02:00
committed by abcdefg30
parent e4bb13ea07
commit a614375982
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -59,6 +59,7 @@ RM_RF = $(RM) -rf
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)
# Only for use in target version: # 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)) 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_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