Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions mesonbuild/compilers/c.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
from .mixins.gnu import GnuCompiler, GnuCStds
from .mixins.gnu import gnu_common_warning_args, gnu_c_warning_args
from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.intel import IntelGnuLikeCompiler, IntelLLVMLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.clang import ClangCompiler, ClangCStds
from .mixins.elbrus import ElbrusCompiler
from .mixins.pgi import PGICompiler
Expand Down Expand Up @@ -397,7 +397,7 @@ def get_option_std_args(self, target: BuildTarget, env: Environment, subproject:
return args


class IntelLLVMCCompiler(ClangCCompiler):
class IntelLLVMCCompiler(IntelLLVMLikeCompiler, ClangCCompiler):

id = 'intel-llvm'

Expand Down
4 changes: 2 additions & 2 deletions mesonbuild/compilers/cpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from .mixins.arm import ArmCompiler, ArmclangCompiler
from .mixins.visualstudio import MSVCCompiler, ClangClCompiler
from .mixins.gnu import GnuCompiler, GnuCPPStds, gnu_common_warning_args, gnu_cpp_warning_args
from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.intel import IntelGnuLikeCompiler, IntelLLVMLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.clang import ClangCompiler, ClangCPPStds
from .mixins.elbrus import ElbrusCompiler
from .mixins.pgi import PGICompiler
Expand Down Expand Up @@ -756,7 +756,7 @@ def get_option_link_args(self, target: 'BuildTarget', env: 'Environment', subpro
return []


class IntelLLVMCPPCompiler(ClangCPPCompiler):
class IntelLLVMCPPCompiler(IntelLLVMLikeCompiler, ClangCPPCompiler):

id = 'intel-llvm'

Expand Down
4 changes: 2 additions & 2 deletions mesonbuild/compilers/fortran.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)
from .mixins.clike import CLikeCompiler
from .mixins.gnu import GnuCompiler, gnu_optimization_args
from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.intel import IntelGnuLikeCompiler, IntelLLVMLikeCompiler, IntelVisualStudioLikeCompiler
from .mixins.clang import ClangCompiler
from .mixins.elbrus import ElbrusCompiler
from .mixins.pgi import PGICompiler
Expand Down Expand Up @@ -442,7 +442,7 @@ def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
return ['-gen-dep=' + outtarget, '-gen-depformat=make']


class IntelLLVMFortranCompiler(IntelFortranCompiler):
class IntelLLVMFortranCompiler(IntelLLVMLikeCompiler, IntelFortranCompiler):

id = 'intel-llvm'

Expand Down
5 changes: 5 additions & 0 deletions mesonbuild/compilers/mixins/intel.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]:
return ['-diag-error', '1292']


class IntelLLVMLikeCompiler:
def openmp_flags(self, env: Environment) -> T.List[str]:
return ['-qopenmp']


class IntelVisualStudioLikeCompiler(VisualStudioLikeCompiler):

"""Abstractions for ICL, the Intel compiler on Windows."""
Expand Down
Loading