From b01b8344ea12dd973977bb801b35836c80857187 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Fri, 3 Mar 2017 15:22:08 +0900 Subject: [PATCH 1/3] build: fix llvm version detection in freebsd-10 In FreeBSD-10, the banner of clang version is "FreeBSD clang version". Fix regex to detect it. --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index e1e8ab5a861c29..1295128452189f 100755 --- a/configure +++ b/configure @@ -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]+)") def get_xcode_version(cc): return get_version_helper( From 4ad3540001a5579a14eaee3901a471137950c5ce Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Fri, 3 Mar 2017 18:23:55 +0900 Subject: [PATCH 2/3] fix indents --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1295128452189f..ad7b277e5ebba9 100755 --- a/configure +++ b/configure @@ -576,12 +576,12 @@ def get_version_helper(cc, regexp): def get_llvm_version(cc): return get_version_helper( - cc, r"(^clang version|^FreeBSD clang version|based on LLVM) " + - "([3-9]\.[0-9]+)") + cc, r"(^clang version|^FreeBSD clang version|based on LLVM) " + + "([3-9]\.[0-9]+)") def get_xcode_version(cc): return get_version_helper( - cc, r"(^Apple LLVM version) ([5-9]\.[0-9]+)") + cc, r"(^Apple LLVM version) ([5-9]\.[0-9]+)") def get_gas_version(cc): try: From ed1d266f36e5f7717bac4a2ec19bf1878afd82ec Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Mon, 6 Mar 2017 12:01:03 +0900 Subject: [PATCH 3/3] change regex to non-capturing parentheses --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index ad7b277e5ebba9..0aa7b2b1713195 100755 --- a/configure +++ b/configure @@ -576,8 +576,7 @@ def get_version_helper(cc, regexp): def get_llvm_version(cc): return get_version_helper( - cc, r"(^clang version|^FreeBSD clang version|based on LLVM) " + - "([3-9]\.[0-9]+)") + cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)") def get_xcode_version(cc): return get_version_helper(