From d51910bb4d234606b41891dd366706b5eeb13cc8 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 19 Feb 2018 17:48:22 +0100
Subject: [PATCH] Compiler/openmpi - do not compile with CUDA support if gcc
 version is new then 5.4

---
 Compiler/openmpi/1.10/variants.Linux | 17 +++++++++--------
 Compiler/openmpi/build               |  8 +++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Compiler/openmpi/1.10/variants.Linux b/Compiler/openmpi/1.10/variants.Linux
index ba19a83..ec90688 100644
--- a/Compiler/openmpi/1.10/variants.Linux
+++ b/Compiler/openmpi/1.10/variants.Linux
@@ -11,17 +11,18 @@ openmpi/1.10.2	stable		gcc/5.4.0
 openmpi/1.10.2	stable		gcc/6.1.0
 openmpi/1.10.2	stable		gcc/6.2.0
 
-openmpi/1.10.2	unstable	intel/15.3
+openmpi/1.10.2	stable		intel/15.3
 
 openmpi/1.10.4	stable		gcc/4.8.5
 openmpi/1.10.4	stable		gcc/4.9.4
 openmpi/1.10.4	stable		gcc/5.4.0
 openmpi/1.10.4	stable		gcc/6.2.0
-openmpi/1.10.4	unstable	gcc/6.3.0
+openmpi/1.10.4	stable		gcc/6.3.0
 
-openmpi/1.10.7	unstable	gcc/4.8.5 b:cuda/8.0.44
-openmpi/1.10.7	unstable	gcc/4.9.4 b:cuda/8.0.44
-openmpi/1.10.7	unstable	gcc/5.4.0 b:cuda/8.0.44
-openmpi/1.10.7	unstable	gcc/6.2.0 b:cuda/8.0.44
-openmpi/1.10.7	unstable	gcc/6.3.0 b:cuda/8.0.44
-openmpi/1.10.7	unstable	gcc/7.2.0 b:cuda/8.0.44
+openmpi/1.10.7	stable		gcc/4.8.5 b:cuda/8.0.44
+openmpi/1.10.7	stable		gcc/4.9.4 b:cuda/8.0.44
+openmpi/1.10.7	stable		gcc/5.4.0 b:cuda/8.0.44
+openmpi/1.10.7	stable		gcc/6.2.0
+openmpi/1.10.7	stable		gcc/6.3.0
+openmpi/1.10.7	stable		gcc/7.2.0
+openmpi/1.10.7	stable		gcc/7.3.0
diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index 6ead2e5..a18cb95 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -4,11 +4,9 @@ SOURCE_URL="http://www.open-mpi.org/software/ompi/v${V_MAJOR}.${V_MINOR}/downloa
 
 pbuild::configure() {
 	declare -a config_args=()
-	case "$OS" in
-		Linux )
-			config_args+=( "--with-cuda=${CUDA_HOME}" )
-			;;
-	esac
+	if [[ -n "${CUDA_VERSION}" ]]; then	
+		config_args+=( "--with-cuda=${CUDA_HOME}" )
+	fi
 
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \