From 3f56eb1bcc6babdb3a1b8c8797aba020b11f968d Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 16 Jul 2020 14:07:45 +0200
Subject: [PATCH] mpich/3.3.2 build, cleanup variant files

---
 Compiler/mpich/files/variants       | 12 ------------
 Compiler/mpich/files/variants.rhel6 |  8 ++++++++
 2 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 Compiler/mpich/files/variants
 create mode 100644 Compiler/mpich/files/variants.rhel6

diff --git a/Compiler/mpich/files/variants b/Compiler/mpich/files/variants
deleted file mode 100644
index 8ebff5e..0000000
--- a/Compiler/mpich/files/variants
+++ /dev/null
@@ -1,12 +0,0 @@
-mpich/3.2.1			stable		gcc/4.8.5
-mpich/3.2.1			stable		gcc/5.5.0
-mpich/3.2.1			stable		gcc/6.4.0
-mpich/3.2.1			stable		gcc/7.3.0
-mpich/3.2.1			stable		gcc/8.2.0
-mpich/3.2.1_merlin		unstable	gcc/6.4.0 b:binutils/2.29 b:mxm/3.6.3104
-mpich/3.2.1_merlin		unstable	gcc/7.3.0 b:binutils/2.29 b:mxm/3.6.3104
-mpich/3.2.1			stable		intel/17.4
-
-mpich/3.3			stable		gcc/7.3.0
-mpich/3.3			stable		gcc/7.4.0
-mpich/3.3			stable		gcc/8.3.0
diff --git a/Compiler/mpich/files/variants.rhel6 b/Compiler/mpich/files/variants.rhel6
new file mode 100644
index 0000000..ca89e5f
--- /dev/null
+++ b/Compiler/mpich/files/variants.rhel6
@@ -0,0 +1,8 @@
+mpich/3.1.4		deprecated	gcc/{4.7.4,4.8.4,4.9.2,5.1.0}
+mpich/3.1.4		deprecated	intel/15.2
+
+mpich/3.2.1		stable		gcc/{4.8.5,5.5.0,6.4.0,7.3.0,8.2.0}
+mpich/3.2.1		stable		intel/17.4
+
+mpich/3.3		stable		gcc/{7.3.0,7.4.0,8.3.0}
+mpich/3.3.2		unstable	gcc/{7.5.0,8.4.0,9.3.0}