From fe8734cd52d161142cccdb87d8fa4e4ae65358e8 Mon Sep 17 00:00:00 2001 From: Robert Cohn Date: Fri, 12 May 2023 10:58:08 -0400 Subject: [PATCH] Fix logic in setting oneapi microarchitecture flags (#37634) --- lib/spack/spack/compilers/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 3c628980e31..5d013b13440 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -804,8 +804,10 @@ def name_matches(name, name_list): toolchains.add(compiler_cls.__name__) if len(toolchains) > 1: - if toolchains == set(["Clang", "AppleClang", "Aocc"]) or toolchains == set( - ["Dpcpp", "Oneapi"] + if ( + toolchains == set(["Clang", "AppleClang", "Aocc"]) + # Msvc toolchain uses Intel ifx + or toolchains == set(["Msvc", "Dpcpp", "Oneapi"]) ): return False tty.debug("[TOOLCHAINS] {0}".format(toolchains))