Skip to content

Commit

Permalink
configure: Accept LLVM 3.4.X during configuration
Browse files Browse the repository at this point in the history
The previous regex was a bit to strict, rejecting versions such as 3.4.1 which
is apparently the version which travis is currently installing, causing all
travis builds to fail.
  • Loading branch information
alexcrichton committed Mar 30, 2014
1 parent ec7d0c7 commit 9f990f7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ then
LLVM_VERSION=$($LLVM_CONFIG --version)

case $LLVM_VERSION in
(3.[2-5]svn|3.[2-5])
(3.[2-5]*)
msg "found ok version of LLVM: $LLVM_VERSION"
;;
(*)
Expand Down

5 comments on commit 9f990f7

@bors
Copy link
Contributor

@bors bors commented on 9f990f7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from sfackler
at alexcrichton@9f990f7

@bors
Copy link
Contributor

@bors bors commented on 9f990f7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/fix-configure-for-travis = 9f990f7 into auto

@bors
Copy link
Contributor

@bors bors commented on 9f990f7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/fix-configure-for-travis = 9f990f7 merged ok, testing candidate = 612e22e

@bors
Copy link
Contributor

@bors bors commented on 9f990f7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 9f990f7 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 612e22e

Please sign in to comment.