1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00

[macOS] Check Apple specific version instead of generic clang version.

This commit is contained in:
bruvzg
2023-11-22 09:05:45 +02:00
parent 7022271291
commit 5201475f62
2 changed files with 33 additions and 4 deletions

View File

@@ -1012,6 +1012,11 @@ def get_compiler_version(env):
"metadata1": None,
"metadata2": None,
"date": None,
"apple_major": -1,
"apple_minor": -1,
"apple_patch1": -1,
"apple_patch2": -1,
"apple_patch3": -1,
}
if not env.msvc:
@@ -1039,8 +1044,32 @@ def get_compiler_version(env):
for key, value in match.groupdict().items():
if value is not None:
ret[key] = value
match_apple = re.search(
r"(?:(?<=clang-)|(?<=\) )|(?<=^))"
r"(?P<apple_major>\d+)"
r"(?:\.(?P<apple_minor>\d*))?"
r"(?:\.(?P<apple_patch1>\d*))?"
r"(?:\.(?P<apple_patch2>\d*))?"
r"(?:\.(?P<apple_patch3>\d*))?",
version,
)
if match_apple is not None:
for key, value in match_apple.groupdict().items():
if value is not None:
ret[key] = value
# Transform semantic versioning to integers
for key in ["major", "minor", "patch"]:
for key in [
"major",
"minor",
"patch",
"apple_major",
"apple_minor",
"apple_patch1",
"apple_patch2",
"apple_patch3",
]:
ret[key] = int(ret[key] or -1)
return ret