diff options
| -rw-r--r-- | methods.py | 14 | ||||
| -rw-r--r-- | platform/linuxbsd/detect.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/methods.py b/methods.py index a6416ccdd2..7067c21946 100644 --- a/methods.py +++ b/methods.py @@ -1016,13 +1016,13 @@ def get_compiler_version(env): else: # TODO: Implement for MSVC return None match = re.search( - "(?:(?<=version )|(?<=\) )|(?<=^))" - "(?P<major>\d+)" - "(?:\.(?P<minor>\d*))?" - "(?:\.(?P<patch>\d*))?" - "(?:-(?P<metadata1>[0-9a-zA-Z-]*))?" - "(?:\+(?P<metadata2>[0-9a-zA-Z-]*))?" - "(?: (?P<date>[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?", + r"(?:(?<=version )|(?<=\) )|(?<=^))" + r"(?P<major>\d+)" + r"(?:\.(?P<minor>\d*))?" + r"(?:\.(?P<patch>\d*))?" + r"(?:-(?P<metadata1>[0-9a-zA-Z-]*))?" + r"(?:\+(?P<metadata2>[0-9a-zA-Z-]*))?" + r"(?: (?P<date>[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?", version, ) if match is not None: diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index a723bb5d58..571d2a47d8 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -455,7 +455,7 @@ def configure(env: "Environment"): linker_version_str = subprocess.check_output( [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"]) ).decode("utf-8") - gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) + gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) if not gnu_ld_version: print( "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold." |