diff options
| author | bors <bors@rust-lang.org> | 2015-06-03 06:07:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-03 06:07:44 +0000 |
| commit | a5979be9fefe671fa81ec70720234602f8112bec (patch) | |
| tree | aeaeee2b4e914b3384106d9e3bd3c939e37657d2 | |
| parent | 2c8d75d655b7d0bf84178f464c47a79569a35f3c (diff) | |
| parent | bc85eb49f5d5ed88ba704df760c31ef7f47083ec (diff) | |
| download | rust-a5979be9fefe671fa81ec70720234602f8112bec.tar.gz rust-a5979be9fefe671fa81ec70720234602f8112bec.zip | |
Auto merge of #25938 - wca:fix-clang-check-compatibility, r=alexcrichton
Not all /bin/sh have [[ available, so for compatibility using case..esac for pattern matching is better.
| -rwxr-xr-x | configure | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure b/configure index 9be47beeb91..536a938eaed 100755 --- a/configure +++ b/configure @@ -973,8 +973,8 @@ fi if [ ! -z "$CFG_ENABLE_CLANG" ] then - if [ -z "$CC" ] || [[ $CC == *clang ]] - then + case "$CC" in + (''|*clang) CFG_CLANG_VERSION=$($CFG_CC \ --version \ | grep version \ @@ -994,9 +994,11 @@ then err "bad CLANG version: $CFG_CLANG_VERSION, need >=3.0svn" ;; esac - else + ;; + (*) msg "skipping CFG_ENABLE_CLANG version check; provided CC=$CC" - fi + ;; + esac fi if [ ! -z "$CFG_ENABLE_CCACHE" ] |