From b59077b97252174eaeeac3fe84e16d29efb318b1 Mon Sep 17 00:00:00 2001 From: Yamagi Date: Fri, 20 May 2022 12:51:39 +0200 Subject: [PATCH] Normalize `arm64` to `aarch64`. This ensures that we call ARM64 `aarch64` on all platform, which aren't MacOS or Windows. And it fixes the bug, that `arm64` was normalized to `arm`, making incompatible savegames between 32 bit and 64 bit ARM loadable. Leading to crashes. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 176c3574..0a58fb57 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ endif # windows but MINGW_CHOST not defined else ifneq ($(YQ2_OSTYPE), Darwin) # Normalize some abiguous YQ2_ARCH strings -YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/^arm.*/arm/') +YQ2_ARCH ?= $(shell uname -m | sed -e 's/i.86/i386/' -e 's/amd64/x86_64/' -e 's/arm64/aarch64/' -e 's/^arm.*/arm/') else YQ2_ARCH ?= $(shell uname -m) endif