Skip to content

Commit

Permalink
Updated compiler version detection
Browse files Browse the repository at this point in the history
This fixes multiple issues/inconsistencies around  `get_compiler_version()`:
* With no shell allocated, launching the compiler could fail even
  with proper paths being set.
* The return value was described as "an array of version numbers as ints",
  but the function actually returned a `Dictionary` (or `None`).
* Not all calls were properly handling a `None` return value in case of errors.
  On Windows this broke compiling for me since godotengine#81869 with default settings.
* Some calls defined inconsistent defaults/fallbacks (`0` or `-1`).
  • Loading branch information
MarioLiebisch authored and mandryskowski committed Oct 11, 2023
1 parent bb7f0a1 commit 59c9aa4
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 21 deletions.
35 changes: 26 additions & 9 deletions methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -1002,19 +1002,32 @@ def is_vanilla_clang(env):

def get_compiler_version(env):
"""
Returns an array of version numbers as ints: [major, minor, patch].
The return array should have at least two values (major, minor).
Returns a dictionary with various version information:
- major, minor, patch: Version following semantic versioning system
- metadata1, metadata2: Extra information
- date: Date of the build
"""
ret = {
"major": -1,
"minor": -1,
"patch": -1,
"metadata1": None,
"metadata2": None,
"date": None,
}

if not env.msvc:
# Not using -dumpversion as some GCC distros only return major, and
# Clang used to return hardcoded 4.2.1: # https://reviews.llvm.org/D56803
try:
version = subprocess.check_output([env.subst(env["CXX"]), "--version"]).strip().decode("utf-8")
version = subprocess.check_output([env.subst(env["CXX"]), "--version"], shell=True).strip().decode("utf-8")
except (subprocess.CalledProcessError, OSError):
print("Couldn't parse CXX environment variable to infer compiler version.")
return None
else: # TODO: Implement for MSVC
return None
return ret
else:
# TODO: Implement for MSVC
return ret
match = re.search(
r"(?:(?<=version )|(?<=\) )|(?<=^))"
r"(?P<major>\d+)"
Expand All @@ -1026,9 +1039,13 @@ def get_compiler_version(env):
version,
)
if match is not None:
return match.groupdict()
else:
return None
for key, value in match.groupdict().items():
if value is not None:
ret[key] = value
# Transform semantic versioning to integers
for key in ["major", "minor", "patch"]:
ret[key] = int(ret[key] or -1)
return ret


def using_gcc(env):
Expand Down
2 changes: 1 addition & 1 deletion platform/linuxbsd/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def configure(env: "Environment"):
print("Using linker program: " + env["linker"])
if env["linker"] == "mold" and using_gcc(env): # GCC < 12.1 doesn't support -fuse-ld=mold.
cc_version = get_compiler_version(env)
cc_semver = (int(cc_version["major"]), int(cc_version["minor"]))
cc_semver = (cc_version["major"], cc_version["minor"])
if cc_semver < (12, 1):
found_wrapper = False
for path in ["/usr/libexec", "/usr/local/libexec", "/usr/lib", "/usr/local/lib"]:
Expand Down
13 changes: 3 additions & 10 deletions platform/macos/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,9 @@ def configure(env: "Environment"):
env.Append(CCFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])
env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])

cc_version = get_compiler_version(env) or {
"major": None,
"minor": None,
"patch": None,
"metadata1": None,
"metadata2": None,
"date": None,
}
cc_version_major = int(cc_version["major"] or -1)
cc_version_minor = int(cc_version["minor"] or -1)
cc_version = get_compiler_version(env)
cc_version_major = cc_version["major"]
cc_version_minor = cc_version["minor"]
vanilla = is_vanilla_clang(env)

# Workaround for Xcode 15 linker bug.
Expand Down
2 changes: 1 addition & 1 deletion platform/web/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def configure(env: "Environment"):

# Get version info for checks below.
cc_version = get_compiler_version(env)
cc_semver = (int(cc_version["major"]), int(cc_version["minor"]), int(cc_version["patch"]))
cc_semver = (cc_version["major"], cc_version["minor"], cc_version["patch"])

if env["lto"] != "none":
# Workaround https://github.com/emscripten-core/emscripten/issues/19781.
Expand Down

0 comments on commit 59c9aa4

Please sign in to comment.