Merge pull request #91 from devnexen/build_macos_arm_fix

Forcing proper native arch build on darwin mainly due to arm64
This commit is contained in:
Yamagi 2022-05-20 12:48:33 +02:00 committed by GitHub
commit ca5e278670
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -47,8 +47,12 @@ YQ2_ARCH ?= $(PROCESSOR_ARCHITECTURE)
endif endif
endif # windows but MINGW_CHOST not defined endif # windows but MINGW_CHOST not defined
else else
ifneq ($(YQ2_OSTYPE), Darwin)
# Normalize some abiguous YQ2_ARCH strings # 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/^arm.*/arm/')
else
YQ2_ARCH ?= $(shell uname -m)
endif
endif endif
# On Windows / MinGW $(CC) is undefined by default. # On Windows / MinGW $(CC) is undefined by default.