aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-10 13:47:41 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-10 13:51:24 -0700
commitdcfd9185488a843e85f051169ee1d10f503a13ef (patch)
tree9e353d9019355cabdab1c97b303a65ce83fa9ac4
parent3e82a4b517d149cc8e685f56d865c12343de0f47 (diff)
downloadmeson-dcfd9185488a843e85f051169ee1d10f503a13ef.zip
meson-dcfd9185488a843e85f051169ee1d10f503a13ef.tar.gz
meson-dcfd9185488a843e85f051169ee1d10f503a13ef.tar.bz2
run_unittests: assume that on windows that intel means icl
There actually is an ICC for windows that can be used to cross compile from Windows to Linux, but it's not supported in meson currently and I don't plan to enable it.
-rwxr-xr-xrun_unittests.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 5fe8f4a..0ce4a77 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5867,6 +5867,10 @@ class NativeFileTests(BasePlatformTests):
raise unittest.SkipTest('No alternate Fortran implementation.')
elif comp.id == 'gcc':
if shutil.which('ifort'):
+ # There is an ICC for windows (windows build, linux host),
+ # but we don't support that ATM so lets not worry about it.
+ if is_windows():
+ return 'ifort', 'intel-cl'
return 'ifort', 'intel'
elif shutil.which('flang'):
return 'flang', 'flang'