Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compilers/clike: ICL needs msvc workarounds in has_function

This commit is contained in:
Dylan Baker 2019-05-03 13:55:01 -07:00
parent fa54f05f09
commit f5ea341319
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/compilers/clike.py
View File

@ -776,7 +776,7 @@ class CLikeCompiler:
return True, cached return True, cached
# MSVC does not have compiler __builtin_-s. # MSVC does not have compiler __builtin_-s.
if self.get_id() == 'msvc': if self.get_id() in {'msvc', 'intel-cl'}:
return False, False return False, False
# Detect function as a built-in # Detect function as a built-in

2
run_project_tests.py
View File

@ -120,7 +120,7 @@ def get_relative_files_list_from_dir(fromdir):
def platform_fix_name(fname, compiler, env): def platform_fix_name(fname, compiler, env):
# canonicalize compiler # canonicalize compiler
if compiler == 'clang-cl': if compiler in {'clang-cl', 'intel-cl'}:
canonical_compiler = 'msvc' canonical_compiler = 'msvc'
else: else:
canonical_compiler = compiler canonical_compiler = compiler