boost: remove Compiler.cxx_names (#46037)

This commit is contained in:
Massimiliano Culpo 2024-08-30 13:25:40 +02:00 committed by GitHub
parent dd756d53de
commit bf1f4e15ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -462,24 +462,24 @@ def flag_handler(self, name, flags):
def determine_toolset(self, spec): def determine_toolset(self, spec):
toolsets = { toolsets = {
"g++": "gcc", "%gcc": "gcc",
"icpc": "intel", "%intel": "intel",
"icpx": "intel", "%oneapi": "intel",
"clang++": "clang", "%clang": "clang",
"armclang++": "clang", "%arm": "clang",
"xlc++": "xlcpp", "%xl": "xlcpp",
"xlc++_r": "xlcpp", "%xl_r": "xlcpp",
"pgc++": "pgi", "%pgi": "pgi",
"nvc++": "pgi", "%nvhpc": "pgi",
"FCC": "clang", "%fj": "clang",
} }
if spec.satisfies("@1.47:"): if spec.satisfies("@1.47:"):
toolsets["icpc"] += "-linux" toolsets["%intel"] += "-linux"
toolsets["icpx"] += "-linux" toolsets["%oneapi"] += "-linux"
for cc, toolset in toolsets.items(): for cc, toolset in toolsets.items():
if cc in self.compiler.cxx_names: if self.spec.satisfies(cc):
return toolset return toolset
# fallback to gcc if no toolset found # fallback to gcc if no toolset found