[NFC][lit] Use proper semantic versioning names for variables

The variable named `minor` was actually pointing to the patch part of
the version. While I was changing this I also made the check for Apple
clang more robust by checking both patch and minor rather than just
minor.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319656 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/lit/lit/llvm/config.py b/utils/lit/lit/llvm/config.py
index e3be929d716ded85ce15b4ff0e0c06d1c04436b9..3c9a2cc559c1e3b1eae95352ea328591fd36ca01 100644 (file)
--- a/utils/lit/lit/llvm/config.py
+++ b/utils/lit/lit/llvm/config.py
@@ -225,9 +225,10 @@ class LLVMConfig(object):
         if re.match(r'^x86_64.*-apple', triple):
             version_regex = re.search(r'version ([0-9]+)\.([0-9]+).([0-9]+)', version_string)
             major_version_number = int(version_regex.group(1))
-            minor_version_number = int(version_regex.group(3))
+            minor_version_number = int(version_regex.group(2))
+            patch_version_number = int(version_regex.group(3))
             if 'Apple LLVM' in version_string:
-                return major_version_number >= 9 and minor_version_number > 0
+                return major_version_number >= 9 and (minor_version_number > 0 or patch_version_number > 0)
             else:
                 return major_version_number >= 5