Skip to content

Commit

Permalink
Correct detection for mypy
Browse files Browse the repository at this point in the history
  • Loading branch information
gerioldman committed Oct 10, 2023
1 parent 1fac4a9 commit 242a2f5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion mesonbuild/compilers/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@ def sanitize(p: str) -> str:
elif 'MCS' in err:
cls = c.TaskingMCSCCompiler
lnk = linkers.TaskingMCSLinker
else:
raise EnvironmentException(f'Failed to detect linker for TASKING VX-toolset compiler. Please update your cross file(s).')


tasking_ver_match = re.search(r'v(\d+)\.(\d+)r(\d+) Build (\d+)', err)
assert tasking_ver_match is not None, 'for mypy'
Expand All @@ -641,7 +644,7 @@ def sanitize(p: str) -> str:
env.coredata.add_lang_args(cls.language, cls, for_machine, env)
ld = env.lookup_binary_entry(for_machine, cls.language + '_ld')

linker = lnk(ld, for_machine, version=tasking_version)
linker = lnk(ld, for_machine, version=tasking_version) # Fix needed here
return cls(
ccache, compiler, tasking_version, for_machine, is_cross, info,
exe_wrap, full_version=full_version, linker=linker)
Expand Down

0 comments on commit 242a2f5

Please sign in to comment.