From 75a38b2e2e059fad4dde1935a8289e82786fc18a Mon Sep 17 00:00:00 2001 From: Josh de Kock Date: Sat, 2 Jul 2016 00:08:12 +0100 Subject: [PATCH 1/2] Makefile: fix sed on OSX sed on OSX doesn't have -r so default to the usage of GNU sed --- src/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 6b0a41371..4fdcb5b24 100644 --- a/src/Makefile +++ b/src/Makefile @@ -63,6 +63,9 @@ FIND := find INSTALL := install RM := rm SED := sed +ifeq ($(UNAME),Darwin) +SED := gsed +endif ## ## Cross compiler paths @@ -81,7 +84,7 @@ CC_WIN_64 := x86_64-w64-mingw32-gcc COMPTIME := $(shell date +%s) VERSION_EXPORT := $Format:%D$ -VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|sed -r 's|.* (\w+/)?([^ ]+)|\2|') +VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|$(SED) -r 's|.* (\w+/)?([^ ]+)|\2|') ## ## Compiler flags From 86cf95e878d57de30543b399d5318d4199208ae1 Mon Sep 17 00:00:00 2001 From: Josh de Kock Date: Sat, 2 Jul 2016 00:11:37 +0100 Subject: [PATCH 2/2] Makefile: remove .app for OSX --- src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 4fdcb5b24..9f11325da 100644 --- a/src/Makefile +++ b/src/Makefile @@ -109,7 +109,6 @@ BINARY_NATIVE := $(PROG_NAME) ifeq ($(UNAME),Darwin) export MACOSX_DEPLOYMENT_TARGET=10.9 -BINARY_NATIVE := $(BINARY_NATIVE).app CFLAGS_NATIVE := -D_POSIX -DDARWIN CFLAGS_NATIVE += $(CFLAGS) LFLAGS_NATIVE := -lpthread @@ -181,7 +180,7 @@ native: hashcat binaries: linux32 linux64 win32 win64 clean: - $(RM) -f obj/*.o *.bin *.exe *.app *.restore *.out *.pot *.dictstat *.log hashcat core + $(RM) -f obj/*.o *.bin *.exe *.restore *.out *.pot *.dictstat *.log hashcat core $(RM) -rf *.induct $(RM) -rf *.outfiles $(RM) -rf *.dSYM