1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-08-01 03:18:17 +00:00

Merge pull request #4311 from matrix/apple_silicon_makefile

fix bug on Makefile with detection of Apple Silicon systems
This commit is contained in:
hashcat-bot 2025-07-11 07:40:41 +02:00 committed by GitHub
commit bb5500f264
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -85,7 +85,7 @@ AR := /usr/bin/ar
SED := /usr/bin/sed
SED_IN_PLACE := -i ""
DARWIN_VERSION := $(shell uname -r | cut -d. -f1)
IS_APPLE_SILICON := $(shell lipo /bin/zsh -verify_arch arm64e && echo 1 || echo 0)
IS_APPLE_SILICON := $(shell [ "$$(sysctl -in hw.optional.arm64 2>/dev/null)" = "1" ] && echo 1 || echo 0)
endif
ifneq (,$(filter $(UNAME),FreeBSD NetBSD))
@ -237,8 +237,10 @@ CFLAGS_UNRAR += -Wno-class-memaccess
CFLAGS_UNRAR += -Wno-misleading-indentation
CFLAGS_UNRAR += -Wno-format-overflow
else
ifeq ($(IS_APPLE_SILICON),0)
CFLAGS_UNRAR += -Wno-nontrivial-memcall
endif
endif
CFLAGS_UNRAR += -Wno-missing-braces
CFLAGS_UNRAR += -Wno-unused-variable
CFLAGS_UNRAR += -Wno-unused-parameter