From a15e53ce60a7e5d8332a5132279c5bf1f9215497 Mon Sep 17 00:00:00 2001 From: David CARLIER Date: Sat, 3 Jul 2021 16:02:58 +0100 Subject: [PATCH] build fix proposal on mac where archs are well defined. the arch normalization leads to arm32 bit build under mac m1. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 103db4c1..3f9d72ce 100644 --- a/Makefile +++ b/Makefile @@ -109,8 +109,12 @@ YQ2_ARCH ?= $(PROCESSOR_ARCHITECTURE) endif 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/') +else +YQ2_ARCH ?= $(shell uname -m) +endif endif # On Windows / MinGW $(CC) is undefined by default.