aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-10 12:42:44 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-10 13:36:35 -0700
commit23d2311d1237f1d62ba286db8d325381a05dd1e4 (patch)
tree6da299d60392d9fae1307d26b20940c5a2a6b6a8
parent0dc88487ddcaf85755465e9ae8f37f2a358db544 (diff)
downloadmeson-23d2311d1237f1d62ba286db8d325381a05dd1e4.zip
meson-23d2311d1237f1d62ba286db8d325381a05dd1e4.tar.gz
meson-23d2311d1237f1d62ba286db8d325381a05dd1e4.tar.bz2
tests/fortran/9 cpp: It's okay to link ICL and ifort
This test currently assumes that the fortran compiler is gfotran, and if we're not using g++ it skips. This patch changes it to skip if the fotran compiler and the c++ compiler aren't the same family. This still may skip in some cases it shouldn't (clang and gfort probably work fine on windows), but it does enable ifort + ICL. Which is hte point.
-rw-r--r--test cases/fortran/9 cpp/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/fortran/9 cpp/meson.build b/test cases/fortran/9 cpp/meson.build
index ad7d4b2..7f73985 100644
--- a/test cases/fortran/9 cpp/meson.build
+++ b/test cases/fortran/9 cpp/meson.build
@@ -7,7 +7,7 @@ if cpp.get_id() == 'clang'
error('MESON_SKIP_TEST Clang C++ does not find -lgfortran for some reason.')
endif
-if build_machine.system() == 'windows' and cpp.get_id() != 'gnu'
+if build_machine.system() == 'windows' and cpp.get_id() != fc.get_id()
error('MESON_SKIP_TEST mixing gfortran with non-GNU C++ does not work.')
endif