]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Fix gcc version detection (from iceman1001 fork), fix issue #386 (#388)
authorFl0-0 <Fl0-0@users.noreply.github.com>
Sun, 27 Aug 2017 10:08:48 +0000 (12:08 +0200)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Sun, 27 Aug 2017 10:08:48 +0000 (12:08 +0200)
client/Makefile

index cadd733910897b6d876c1e843cf5f4de669b3dfc..5cdaebb0a1c752cd6672639247adfe0cd5874df2 100644 (file)
@@ -184,7 +184,7 @@ 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 --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
Impressum, Datenschutz