This should supersede the old-patch of mine "Fix code for requiring
gfortran and g77 in tests" (which happened to kick-start this patch
series BTW). Note that no "g77" special requirement is added anymore,
since presently no test script is using it.
Regards,
Stefano
-*-*-*-
Fix code for requiring gfortran in tests.
* tests/defs.in: Correctly set and export F77 and/or FC when
gfortran is in $required.
---
ChangeLog | 6 ++++++
tests/defs.in | 9 +++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
From 422e5322812d6576a9076996869d3f1757a3f2cc Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Fri, 2 Jul 2010 12:41:30 +0200
Subject: [PATCH 11/14] Fix code for requiring gfortran in tests.
* tests/defs.in: Correctly set and export F77 and/or FC when g77
and/or gfortran are in $required, even when they both required.
---
ChangeLog | 6 ++++++
tests/defs.in | 9 +++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5d027b2..6a1d5a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
2010-07-02 Stefano Lattarini <stefano.lattar...@gmail.com>
+
+ Fix code for requiring gfortran in tests.
+ * tests/defs.in: Correctly set and export F77 and/or FC when
+ gfortran is in $required.
+
+2010-07-02 Stefano Lattarini <stefano.lattar...@gmail.com>
Ralf Wildenhues <ralf.wildenh...@gmx.de>
New requirements "fortran" and "fortran77", for tests using
diff --git a/tests/defs.in b/tests/defs.in
index 588c3ec..42a23ef 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -189,6 +189,15 @@ do
# gfortran should be able to seamlessly compile Fortran 77 code
require_compiler 'F77' g77 gfortran
;;
+ gfortran)
+ require_gnu_compiler 'FC' gfortran
+ # This ensures that gfortran and a fortran77 compiler can both be
+ # required.
+ case " $required " in
+ *\ fortran77\ *);;
+ *) F77=$FC; export F77;;
+ esac
+ ;;
icc)
CC=icc
export CC
--
1.6.5
