Skip to content

autotools: skip compiler prefixes during aclocal directory search #6277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bernhardkaindl wants to merge 1 commit into
base: develop
Choose a base branch
from
+24 −1
Open

autotools: skip compiler prefixes during aclocal directory search #6277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion repos/spack_repo/builtin/build_systems/autotools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import subprocess
from typing import Callable, List, Optional, Set, Tuple, Union

from spack import deptypes
from spack.package import (
BuilderWithDefaults,
Executable,
Expand Down Expand Up @@ -856,7 +857,11 @@ def _autoreconf_search_path_args(spec: Spec) -> List[str]:
except OSError:
pass

for dep in spec.dependencies(deptype="build"):
for edge in spec.edges_to_dependencies(depflag=deptypes.BUILD):
# compiler prefixes might have foreign aclocal files which we do not want to include
if any(language in edge.virtuals for language in ("c", "cxx", "fortran")):
continue
dep = edge.spec
path = dep.prefix.share.aclocal
# Skip non-existing aclocal paths
try:
Expand Down
18 changes: 18 additions & 0 deletions tests/build_systems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,24 @@ def test_autoreconf_search_path_args_external_order(
]


def test_autoreconf_search_path_args_skip_compiler(
default_mock_concretization, tmp_path: pathlib.Path
):
"""Compiler prefixes are not aclocal macro providers."""
spec = default_mock_concretization("dttop")
compiler, macro_provider = spec.dependencies(deptype="build")
compiler_aclocal = tmp_path / "compiler" / "share" / "aclocal"
provider_aclocal = tmp_path / "provider" / "share" / "aclocal"
compiler_aclocal.mkdir(parents=True)
provider_aclocal.mkdir(parents=True)
compiler.external_path = str(tmp_path / "compiler")
macro_provider.set_prefix(str(tmp_path / "provider"))
compiler_edge = next(edge for edge in spec.edges_to_dependencies() if edge.spec is compiler)
compiler_edge.virtuals = ("c", "cxx")

assert autotools._autoreconf_search_path_args(spec) == ["-I", str(provider_aclocal)]


def test_autoreconf_search_path_skip_nonexisting(
default_mock_concretization, tmp_path: pathlib.Path
):
Expand Down
Loading