]> git.kaiwu.me - nginx.git/commitdiff
Configure: fixed detection of newer Apple clang compilers.
authorRuslan Ermilov <ru@nginx.com>
Mon, 29 Apr 2013 14:07:22 +0000 (18:07 +0400)
committerRuslan Ermilov <ru@nginx.com>
Mon, 29 Apr 2013 14:07:22 +0000 (18:07 +0400)
auto/cc/clang
auto/cc/name

index 9f60d7b3a2bcc795894c234be67d9ba767a56cde..2611caa65047ff78e644c639cafd383d1b62f49f 100644 (file)
@@ -5,8 +5,8 @@
 # clang
 
 
-NGX_CLANG_VER=`$CC -v 2>&1 | grep 'clang version' 2>&1 \
-                           | sed -e 's/^.*clang version \(.*\)/\1/'`
+NGX_CLANG_VER=`$CC -v 2>&1 | grep '\(clang\|LLVM\) version' 2>&1 \
+                           | sed -e 's/^.* version \(.*\)/\1/'`
 
 echo " + clang version: $NGX_CLANG_VER"
 
index 7a5656c64752d91f8eeeb34be6b07ecae59caa9f..51a7ed92e1d158d0248db173790549d5af1d871d 100644 (file)
@@ -67,7 +67,7 @@ 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 version' >/dev/null 2>&1`; then
+elif `$CC -v 2>&1 | grep '\(clang\|LLVM\) version' >/dev/null 2>&1`; then
     NGX_CC_NAME=clang
     echo " + using Clang C compiler"