From bf1f4e15ee105ee357726da5c0be6ed3de20668e Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 30 Aug 2024 13:25:40 +0200 Subject: boost: remove Compiler.cxx_names (#46037) --- var/spack/repos/builtin/packages/boost/package.py | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 6ea37cb50e..d813ce6653 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -462,24 +462,24 @@ class Boost(Package): def determine_toolset(self, spec): toolsets = { - "g++": "gcc", - "icpc": "intel", - "icpx": "intel", - "clang++": "clang", - "armclang++": "clang", - "xlc++": "xlcpp", - "xlc++_r": "xlcpp", - "pgc++": "pgi", - "nvc++": "pgi", - "FCC": "clang", + "%gcc": "gcc", + "%intel": "intel", + "%oneapi": "intel", + "%clang": "clang", + "%arm": "clang", + "%xl": "xlcpp", + "%xl_r": "xlcpp", + "%pgi": "pgi", + "%nvhpc": "pgi", + "%fj": "clang", } if spec.satisfies("@1.47:"): - toolsets["icpc"] += "-linux" - toolsets["icpx"] += "-linux" + toolsets["%intel"] += "-linux" + toolsets["%oneapi"] += "-linux" for cc, toolset in toolsets.items(): - if cc in self.compiler.cxx_names: + if self.spec.satisfies(cc): return toolset # fallback to gcc if no toolset found -- cgit v1.2.3-70-g09d2