From 378e46f8b678d09a2a84bd3735ae0f44867acf3d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 13 Dec 2018 10:42:56 +0000 Subject: [PATCH] defs.mk: Beautify gcc and ld version parsing And be compatible with CentOS while at it Signed-off-by: Jan Lindemann --- make/defs.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 7b557497..896f90e1 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -279,15 +279,18 @@ SUBDIRS_TO_ITERATE = $(filter-out $(IGNORE_SUBDIRS),$(SUBDIRS)) # compiler and linker # gcc -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];}') +GCC_VERSION := $(shell $(GCC) -v 2>&1 | $(SED) '/gcc.version/I !d; s/.*version *//I; s/ \+.*//') +GCC_VERSION_NUMBERS := $(subst ., ,$(GCC_VERSION)) +GCC_MAJOR := $(word 1,$(GCC_VERSION_NUMBERS)) +GCC_MINOR := $(word 2,$(GCC_VERSION_NUMBERS)) +GCC_REV := $(word 3,$(GCC_VERSION_NUMBERS)) LD_VERSION := $(shell ld -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') -LD_MAJOR := $(shell echo $(LD_VERSION) | cut -d. -f1) -LD_MINOR := $(shell echo $(LD_VERSION) | cut -d. -f2) -LD_REV := $(shell echo $(LD_VERSION) | cut -d. -f3) +LD_VERSION_NUMBERS := $(subst ., ,$(LD_VERSION)) +LD_MAJOR := $(word 1,$(LD_VERSION_NUMBERS)) +LD_MINOR := $(word 2,$(LD_VERSION_NUMBERS)) +LD_REV := $(word 3,$(LD_VERSION_NUMBERS)) + UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild # clang