From 2c198f75f552febc21968be08211caed05d62ff4 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 23 Aug 2017 07:37:49 +0200 Subject: [PATCH] FIX: gcc version | gcc -dumpversion only exists on later gcc versions. This fix address this problem by using gcc -version instead. Thanks to @winguru https://github.com/iceman1001/proxmark3/issues/123 --- client/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index 6f840e30e..6385efdd0 100644 --- a/client/Makefile +++ b/client/Makefile @@ -93,6 +93,7 @@ CMDSRCS = crapto1/crapto1.c \ loclass/cipherutils.c \ loclass/des.c \ loclass/ikeys.c \ + loclass/hash1_brute.c \ loclass/elite_crack.c \ loclass/fileutils.c \ whereami.c \ @@ -197,7 +198,9 @@ MULTIARCHOBJS = $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_NOSIMD.o) \ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX.o) \ $(MULTIARCHSRCS:%.c=$(OBJDIR)/%_AVX2.o) -GCC_GTEQ_490 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) +#GCC_GTEQ_490 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) +GCC_GTEQ_490 := $(shell expr `gcc --version | awk '/gcc/{print $NF;}' | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` >= 40900) + HARD_SWITCH_NOSIMD = -mno-mmx -mno-sse2 -mno-avx -mno-avx2 HARD_SWITCH_MMX = -mmmx -mno-sse2 -mno-avx -mno-avx2 HARD_SWITCH_SSE2 = -mmmx -msse2 -mno-avx -mno-avx2