diff --git a/builds/Makefile b/builds/Makefile index 2b050d2ed04e..b3071db081f4 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -8,6 +8,8 @@ PREFIX=$(abspath $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/) ifeq ($(shell arch),arm64) DOTNET_ARCH=arm64 +else ifeq ($(shell sysctl -n sysctl.proc_translated 2>/dev/null),1) +DOTNET_ARCH=arm64 else DOTNET_ARCH=x64 endif @@ -78,7 +80,7 @@ downloads/%: downloads/%.nupkg $(Q) echo "Unzipped $*." downloads/$(DOTNET_INSTALL_NAME): dotnet-install.sh - $(Q) echo "Downloading and installing .NET $(DOTNET_VERSION) into $@..." + $(Q) echo "Downloading and installing .NET $(DOTNET_VERSION) ($(DOTNET_ARCH)) into $@..." $(Q) ./dotnet-install.sh --install-dir "$@.tmp" --version "$(DOTNET_VERSION)" --architecture $(DOTNET_ARCH) --no-path $$DOTNET_INSTALL_EXTRA_ARGS $(Q) rm -Rf "$@" $(Q) mv "$@.tmp" "$@" diff --git a/tests/packaged-macos-tests.mk b/tests/packaged-macos-tests.mk index 2f21c0c557f8..fa506b9b6beb 100644 --- a/tests/packaged-macos-tests.mk +++ b/tests/packaged-macos-tests.mk @@ -7,7 +7,7 @@ include $(TOP)/Make.config export TargetFrameworkFallbackSearchPaths:=$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks export MSBuildExtensionsPathFallbackPathsOverride:=$(MAC_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild -ifeq ($(shell uname -a),"arm64") +ifeq ($(shell arch),"arm64") IS_ARM64=1 IS_APPLE_SILICON=1 endif