Skip to content

Commit e6a838d

Browse files
committed
auto merge of #6739 : kballard/rust/issue-6419, r=catamorphism
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.
2 parents dbc5758 + bf57d65 commit e6a838d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -555,11 +555,11 @@ then
555555
CFG_CLANG_VERSION=$("$CFG_CLANG" \
556556
--version \
557557
| grep version \
558-
| sed 's/.*\(version .*\)/\1/' \
558+
| sed 's/.*\(version .*\)/\1/; s/.*based on \(LLVM .*\))/\1/' \
559559
| cut -d ' ' -f 2)
560560

561561
case $CFG_CLANG_VERSION in
562-
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3* | 4.0* | 4.1* | 4.2*)
562+
(3.0svn | 3.0 | 3.1* | 3.2* | 3.3*)
563563
step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
564564
CFG_C_COMPILER="clang"
565565
;;

0 commit comments

Comments
 (0)