Skip to content

Commit

Permalink
Makefile.defs: get clang version only from --version output
Browse files Browse the repository at this point in the history
- the full version with stderr output included has a different first
line on MacOS, making head -n 1 not extract the version number line
  • Loading branch information
miconda committed Aug 4, 2020
1 parent 5ea7ca4 commit bff689c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Makefile.defs
Expand Up @@ -273,7 +273,7 @@ MKTAGS=ctags
ifneq (,$(findstring gcc, $(CC_LONGVER)))
CC_NAME=gcc
RPAREN=)
CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\
sed -e 's/([^$(RPAREN)]*)//g' \
-e 's/^.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'\
-e 's/^[^0-9].*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
Expand Down Expand Up @@ -335,7 +335,7 @@ endif
ifneq (, $(findstring clang, $(CC_LONGVER)))
#clang should be gcc compatible
CC_NAME=clang
CC_FULLVER:=$(shell echo "$(CC_LONGVER)" | head -n 1 | sed -e 's/.*version \([0-9]\.[0-9]\).*/\1/g' )
CC_FULLVER:=$(shell $(CC) --version 2>/dev/null | head -n 1 | sed -e 's/.*version \([0-9]\.[0-9]\).*/\1/g' )
CC_SHORTVER:=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
CC_VER=$(CC) $(CC_FULLVER)
CC_OPT=-O3
Expand Down

0 comments on commit bff689c

Please sign in to comment.