Skip to content

build: fix llvm version detection in freebsd-10 #11668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shigeki wants to merge 3 commits into from
Closed

build: fix llvm version detection in freebsd-10 #11668

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b01b834
build: fix llvm version detection in freebsd-10
shigeki Mar 3, 2017
4ad3540
fix indents
shigeki Mar 3, 2017
ed1d266
change regex to non-capturing parentheses
shigeki Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,8 @@ def get_version_helper(cc, regexp):

def get_llvm_version(cc):
return get_version_helper(
cc, r"(^clang version|based on LLVM) ([3-9]\.[0-9]+)")
cc, r"(^clang version|^FreeBSD clang version|based on LLVM) " +
"([3-9]\.[0-9]+)")
Copy link
Member

@bnoordhuis bnoordhuis Mar 3, 2017

Choose a reason for hiding this comment

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

You could simply remove the anchor, I think?

Copy link
Contributor Author

@shigeki shigeki Mar 3, 2017

Choose a reason for hiding this comment

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

I thought it could be fixed but have no full confirmation if it has no side effects. This is very conservative fix not to break existing checks.

Copy link
Member

@bnoordhuis bnoordhuis Mar 3, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

I suppose a little conservatism won't hurt. Can you line up the strings?

Copy link
Contributor Author

@shigeki shigeki Mar 3, 2017

Choose a reason for hiding this comment

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

I'm a little coward ;-).
get_xcode_version in 4 lines below had also 4 space indents. I fixed both. Thanks.


def get_xcode_version(cc):
return get_version_helper(
Expand Down