diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-01 10:39:24 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-10 13:43:20 -0700 |
| commit | 3e82a4b517d149cc8e685f56d865c12343de0f47 (patch) | |
| tree | 1ae089acf262de63f6d92027f81681b4ac346bb6 /run_unittests.py | |
| parent | 73eca8255b4c89a11f21fee3708269bcac6942bb (diff) | |
| download | meson-3e82a4b517d149cc8e685f56d865c12343de0f47.zip meson-3e82a4b517d149cc8e685f56d865c12343de0f47.tar.gz meson-3e82a4b517d149cc8e685f56d865c12343de0f47.tar.bz2 | |
run_unittests: intel-cl links like msvc
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py index 9f6075b..5fe8f4a 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -981,6 +981,7 @@ class InternalTests(unittest.TestCase): toolset_ver = cc.get_toolset_version() self.assertIsNotNone(toolset_ver) # Visual Studio 2015 and older versions do not define VCToolsVersion + # TODO: ICL doesn't set this in the VSC2015 profile either if cc.id == 'msvc' and int(''.join(cc.version.split('.')[0:2])) < 1910: return self.assertIn('VCToolsVersion', os.environ) @@ -2821,7 +2822,7 @@ recommended as it is not supported on some platforms''') testdirlib = os.path.join(testdirbase, 'lib') extra_args = None env = get_fake_env(testdirlib, self.builddir, self.prefix) - if env.detect_c_compiler(False).get_id() not in ['msvc', 'clang-cl']: + if env.detect_c_compiler(False).get_id() not in {'msvc', 'clang-cl', 'intel-cl'}: # static libraries are not linkable with -l with msvc because meson installs them # as .a files which unix_args_to_native will not know as it expects libraries to use # .lib as extension. For a DLL the import library is installed as .lib. Thus for msvc |