From 4b974e69435565bfbac071935bb712848ab7548e Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Wed, 29 Oct 2014 19:59:57 +0000
Subject: [PATCH] Task #5844: update my variants file (dop256). CUDA 6.5 does
 not like GCC-4.9.

---
 CMake/variants/variants.dop256 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMake/variants/variants.dop256 b/CMake/variants/variants.dop256
index 5f3b11b6d31..5d3238c4509 100644
--- a/CMake/variants/variants.dop256
+++ b/CMake/variants/variants.dop256
@@ -8,15 +8,16 @@ set(GNU_COMPILE_DEFINITIONS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS)
 # /opt/lofar/external is searched by default
 
 # Refer to symlink that go may through ccache.
-set(GNU_C         /usr/lib/ccache/gcc )
-set(GNU_CXX       /usr/lib/ccache/g++ )
-set(GNU_Fortran   /usr/bin/gfortran )
-set(GNU_ASM       /usr/lib/ccache/gcc )
+#set(GNU_C         /usr/lib/ccache/gcc )
+#set(GNU_CXX       /usr/lib/ccache/g++ )
+#set(GNU_Fortran   /usr/bin/gfortran )
+#set(GNU_ASM       /usr/lib/ccache/gcc )
 
 # CUDA 5.0 headers refuse to try gcc 4.7. Force 4.6 for the moment.
-# This is only needed if configuring/compiling a .cu file with nvcc (not anymore).
-#set(GNU_C         /usr/bin/gcc-4.6 )
-#set(GNU_CXX       /usr/bin/g++-4.6 )
-#set(GNU_Fortran   /usr/bin/gfortran-4.6)
-#set(GNU_ASM       /usr/bin/gcc-4.6 )
+# CUDA 6.5 headers refuse to try gcc 4.9. Force 4.8 for the moment.
+# This is only needed if configuring/compiling a .cu file with nvcc (2 Cobalt tests only).
+set(GNU_C         /usr/bin/gcc-4.8 )
+set(GNU_CXX       /usr/bin/g++-4.8 )
+#set(GNU_Fortran   /usr/bin/gfortran-4.8)
+set(GNU_ASM       /usr/bin/gcc-4.8 )
 
-- 
GitLab