diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2017-11-23 16:33:40 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2017-11-23 16:33:40 +0300 |
| commit | 7a7fc708fb7f6739dc6652ee1f14da1f9e24650d (patch) | |
| tree | a3dfa242758d84c2dc4e9008e80ce93fbed84c27 | |
| parent | 3656f2eb6322ebc4214c14bf3e3c47dfc7c13421 (diff) | |
| download | nginx-7a7fc708fb7f6739dc6652ee1f14da1f9e24650d.tar.gz nginx-7a7fc708fb7f6739dc6652ee1f14da1f9e24650d.zip | |
Configure: fixed clang detection on MINIX.
As per POSIX, basic regular expressions have no alternations, and the
interpretation of the "\|" construct is undefined. At least on MINIX
and Solaris grep interprets "\|" as literal "|", and not as an alternation
as GNU grep does. Removed such constructs introduced in f1daa0356a1d.
This fixes clang detection on MINIX.
| -rw-r--r-- | auto/cc/clang | 2 | ||||
| -rw-r--r-- | auto/cc/name | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/auto/cc/clang b/auto/cc/clang index 19bdaaaa0..9d900c258 100644 --- a/auto/cc/clang +++ b/auto/cc/clang @@ -5,7 +5,7 @@ # clang -NGX_CLANG_VER=`$CC -v 2>&1 | grep '\(clang\|LLVM\) version' 2>&1 \ +NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \ | sed -e 's/^.* version \(.*\)/\1/'` echo " + clang version: $NGX_CLANG_VER" diff --git a/auto/cc/name b/auto/cc/name index 35d319e61..ded93f5bc 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -44,7 +44,11 @@ elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then NGX_CC_NAME=gcc echo " + using GNU C compiler" -elif `$CC -v 2>&1 | grep '\(clang\|LLVM\) version' >/dev/null 2>&1`; then +elif `$CC -v 2>&1 | grep 'clang version' >/dev/null 2>&1`; then + NGX_CC_NAME=clang + echo " + using Clang C compiler" + +elif `$CC -v 2>&1 | grep 'LLVM version' >/dev/null 2>&1`; then NGX_CC_NAME=clang echo " + using Clang C compiler" |