Mercurial > hg > nginx

comparison auto/cc/clang @ 7273:ceab908790c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure: fixed clang version detection (closes #1539). While 325b3042edd6 fixed it on MINIX, it broke it on systems that output the word "version" on several lines with "cc -v". The fix is to only consider "clang version" or "LLVM version" as clang version, but this time only using sed(1).
author Ruslan Ermilov <ru@nginx.com>
date Tue, 24 Apr 2018 14:04:59 +0300
parents 325b3042edd6
children
comparison
equal deleted inserted replaced
7272:fa0e093b64d7 7273:ceab908790c4
4 4
5 # clang 5 # clang
6 6
7 7
8 NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \ 8 NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \
9 | sed -e 's/^.* version \(.*\)/\1/'` 9 | sed -n -e 's/^.*clang version \(.*\)/\1/p' \
10 -e 's/^.*LLVM version \(.*\)/\1/p'`
10 11
11 echo " + clang version: $NGX_CLANG_VER" 12 echo " + clang version: $NGX_CLANG_VER"
12 13
13 have=NGX_COMPILER value="\"clang $NGX_CLANG_VER\"" . auto/define 14 have=NGX_COMPILER value="\"clang $NGX_CLANG_VER\"" . auto/define
14 15