zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler.py: reduce verbosity of implicit link dirs parsing (#43777)

Browse Source
This commit is contained in:
Harmen Stoppels 2024-04-22 16:07:14 +02:00 committed by GitHub
parent 69f417b26a
commit 080fc875eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/compiler.py
View File

@ -109,7 +109,6 @@ def _parse_link_paths(string):
""" """
lib_search_paths = False lib_search_paths = False
raw_link_dirs = [] raw_link_dirs = []
tty.debug("parsing implicit link info")
for line in string.splitlines(): for line in string.splitlines():
if lib_search_paths: if lib_search_paths:
if line.startswith("\t"): if line.startswith("\t"):
@ -124,7 +123,7 @@ def _parse_link_paths(string):
continue continue
if _LINKER_LINE_IGNORE.match(line): if _LINKER_LINE_IGNORE.match(line):
continue continue
tty.debug("linker line: %s" % line) tty.debug(f"implicit link dirs: link line: {line}")
next_arg = False next_arg = False
for arg in line.split(): for arg in line.split():
@ -140,15 +139,12 @@ def _parse_link_paths(string):
link_dir_arg = _LINK_DIR_ARG.match(arg) link_dir_arg = _LINK_DIR_ARG.match(arg)
if link_dir_arg: if link_dir_arg:
link_dir = link_dir_arg.group("dir") link_dir = link_dir_arg.group("dir")
tty.debug("linkdir: %s" % link_dir)
raw_link_dirs.append(link_dir) raw_link_dirs.append(link_dir)
link_dir_arg = _LIBPATH_ARG.match(arg) link_dir_arg = _LIBPATH_ARG.match(arg)
if link_dir_arg: if link_dir_arg:
link_dir = link_dir_arg.group("dir") link_dir = link_dir_arg.group("dir")
tty.debug("libpath: %s", link_dir)
raw_link_dirs.append(link_dir) raw_link_dirs.append(link_dir)
tty.debug("found raw link dirs: %s" % ", ".join(raw_link_dirs))
implicit_link_dirs = list() implicit_link_dirs = list()
visited = set() visited = set()
@ -158,7 +154,7 @@ def _parse_link_paths(string):
implicit_link_dirs.append(normalized_path) implicit_link_dirs.append(normalized_path)
visited.add(normalized_path) visited.add(normalized_path)
tty.debug("found link dirs: %s" % ", ".join(implicit_link_dirs)) tty.debug(f"implicit link dirs: result: {', '.join(implicit_link_dirs)}")
return implicit_link_dirs return implicit_link_dirs