Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve linker detection failure error message.

This commit is contained in:
Jussi Pakkanen 2021-10-01 18:16:53 +03:00
parent 73dd21036c
commit 3feaea6b29
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/linkers/detect.py
View File

@ -115,10 +115,12 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
prefix=comp_class.LINKER_PREFIX if use_linker_prefix else [], prefix=comp_class.LINKER_PREFIX if use_linker_prefix else [],
version=search_version(out), direct=invoked_directly) version=search_version(out), direct=invoked_directly)
elif 'GNU coreutils' in o: elif 'GNU coreutils' in o:
import shutil
fullpath = shutil.which(compiler[0])
raise EnvironmentException( raise EnvironmentException(
"Found GNU link.exe instead of MSVC link.exe. This link.exe " f"Found GNU link.exe instead of MSVC link.exe in {fullpath}\.n"
"is not a linker. You may need to reorder entries to your " "This link.exe is not a linker.\n"
"%PATH% variable to resolve this.") "You may need to reorder entries to your %PATH% variable to resolve this.")
__failed_to_detect_linker(compiler, check_args, o, e) __failed_to_detect_linker(compiler, check_args, o, e)
def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Type['Compiler'], def guess_nix_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Type['Compiler'],