diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-04-29 18:07:22 +0400 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-04-29 18:07:22 +0400 |
| commit | e565dbc6e02130cdf93d748ef84ecaa0f9df86fd (patch) | |
| tree | 99ee7e5296271413e2b4d37d4bbcbb3065fc811b | |
| parent | 8bc3ed7604c7895bd6d612d204a9755097d5f8f1 (diff) | |
| download | nginx-e565dbc6e02130cdf93d748ef84ecaa0f9df86fd.tar.gz nginx-e565dbc6e02130cdf93d748ef84ecaa0f9df86fd.zip | |
Configure: fixed detection of newer Apple clang compilers.
| -rw-r--r-- | auto/cc/clang | 4 | ||||
| -rw-r--r-- | auto/cc/name | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/auto/cc/clang b/auto/cc/clang index 9f60d7b3a..2611caa65 100644 --- a/auto/cc/clang +++ b/auto/cc/clang @@ -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" diff --git a/auto/cc/name b/auto/cc/name index 7a5656c64..51a7ed92e 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -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" |