From 4fd4a19ab07ca266c54eb5f9ef084d7d174780b6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 21 Jul 2014 11:01:43 +0000 Subject: [PATCH] fix: Gcc version pattern matched wrong lines, too Signed-off-by: Jan Lindemann --- make/defs.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 17936265..7bebbded 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -204,10 +204,10 @@ FIND_SUBDIRS = $(filter-out . .. ./nomake ./CVS $(addprefix ./,$(IGNOR SUBDIRS_TO_ITERATE = $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)) # compiler and linker -GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $$3;}') -GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}') -GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}') -GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}') +GCC_VERSION = $(shell gcc -v 2>&1 | grep "gcc version" | awk '{ print $$3;}') +GCC_MAJOR = $(shell gcc -v 2>&1 | grep "gcc version" | awk '{ split($$3,a,"."); print a[1];}') +GCC_MINOR = $(shell gcc -v 2>&1 | grep "gcc version" | awk '{ split($$3,a,"."); print a[2];}') +GCC_REV = $(shell gcc -v 2>&1 | grep "gcc version" | awk '{ split($$3,a,"."); print a[3];}') ifneq ($(GCC_VERSION),4.1.0) ifneq ($(GCC_VERSION),4.5.1)