From 23d2311d1237f1d62ba286db8d325381a05dd1e4 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 10 May 2019 12:42:44 -0700 Subject: [PATCH] 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. --- test cases/fortran/9 cpp/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test cases/fortran/9 cpp/meson.build b/test cases/fortran/9 cpp/meson.build index ad7d4b206..7f73985cd 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