diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-03 13:55:01 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-13 11:22:31 -0700 |
| commit | f5ea341319552e84124f10d8306b4b10f89d72ad (patch) | |
| tree | 4f92a565e5940a60e5f6abb648f35951cba4101c | |
| parent | fa54f05f09da9b1878d51f35535e54e0222c4f1e (diff) | |
| download | meson-f5ea341319552e84124f10d8306b4b10f89d72ad.zip meson-f5ea341319552e84124f10d8306b4b10f89d72ad.tar.gz meson-f5ea341319552e84124f10d8306b4b10f89d72ad.tar.bz2 | |
compilers/clike: ICL needs msvc workarounds in has_function
| -rw-r--r-- | mesonbuild/compilers/clike.py | 2 | ||||
| -rwxr-xr-x | run_project_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/clike.py index f62aa2a..3d29b75 100644 --- a/mesonbuild/compilers/clike.py +++ b/mesonbuild/compilers/clike.py @@ -776,7 +776,7 @@ class CLikeCompiler: return True, cached # MSVC does not have compiler __builtin_-s. - if self.get_id() == 'msvc': + if self.get_id() in {'msvc', 'intel-cl'}: return False, False # Detect function as a built-in diff --git a/run_project_tests.py b/run_project_tests.py index b9077c9..02ceb04 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -120,7 +120,7 @@ def get_relative_files_list_from_dir(fromdir): def platform_fix_name(fname, compiler, env): # canonicalize compiler - if compiler == 'clang-cl': + if compiler in {'clang-cl', 'intel-cl'}: canonical_compiler = 'msvc' else: canonical_compiler = compiler |