summaryrefslogtreecommitdiffstats
path: root/platform/linuxbsd/detect.py
diff options
context:
space:
mode:
authorMario Liebisch <mario.liebisch@gmail.com>2023-09-25 21:08:36 +0200
committerMario Liebisch <mario.liebisch@gmail.com>2023-09-25 21:17:20 +0200
commit426e18fd37f0eedf4cbb39f3dad4e8fad39ebebb (patch)
treedae2a5f04e61f6745c81a553dbb35840a6e0eac8 /platform/linuxbsd/detect.py
parentfcbc50ec144df458aee75db94cdbf6396bd408ed (diff)
downloadredot-engine-426e18fd37f0eedf4cbb39f3dad4e8fad39ebebb.tar.gz
Updated compiler version detection
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 #81869 with default settings. * Some calls defined inconsistent defaults/fallbacks (`0` or `-1`).
Diffstat (limited to 'platform/linuxbsd/detect.py')
-rw-r--r--platform/linuxbsd/detect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index 571d2a47d8..72bffceb1f 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -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"]: