diff options
| author | Kevin Ballard <kevin@sb.org> | 2013-05-25 15:34:51 -0700 |
|---|---|---|
| committer | Kevin Ballard <kevin@sb.org> | 2013-05-25 15:42:51 -0700 |
| commit | bf57d65a117f2d3634b4eda62001e45fe31b0e9d (patch) | |
| tree | 96e6f00df5217c21819b9948f369d0e4a5f6136d | |
| parent | 270627131753c5fe742943e02ff21446aabca103 (diff) | |
| download | rust-bf57d65a117f2d3634b4eda62001e45fe31b0e9d.tar.gz rust-bf57d65a117f2d3634b4eda62001e45fe31b0e9d.zip | |
Issue #6419: Better clang version detection for Apple Clang
Apple Clang uses different version numbering than "regular" clang, but it also provides the "regular" version it's based on. Update the sed pattern to pull out this "regular" version number instead of the Apple version number.
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index 4fb0ed01bdf..fa20f420e50 100755 --- a/configure +++ b/configure @@ -555,11 +555,11 @@ then CFG_CLANG_VERSION=$("$CFG_CLANG" \ --version \ | grep version \ - | sed 's/.*\(version .*\)/\1/' \ + | sed 's/.*\(version .*\)/\1/; s/.*based on \(LLVM .*\))/\1/' \ | cut -d ' ' -f 2) case $CFG_CLANG_VERSION in - (3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*) + (3.0svn | 3.0 | 3.1* | 3.2* | 3.3*) step_msg "found ok version of CLANG: $CFG_CLANG_VERSION" CFG_C_COMPILER="clang" ;; |