Simplify compiler name variables

garlic/apps/bigsort/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     cd BigSort
-    export I_MPI_CXX=${cc.cc.CXX}
+    export I_MPI_CXX=${cc.CXX}
   '';
 
   buildInputs = [
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   ++ optional (nanos6 != null) nanos6;
 
   makeFlags = [
-    "CC=${cc.cc.CC}"
-    "CXX=${cc.cc.CXX}"
+    "CC=${cc.CC}"
+    "CXX=${cc.CXX}"
     "CPP_BIN=mpicxx"
     "CLUSTER=MareNostrum4"
     "OPENMP=yes"

garlic/apps/bigsort/genseq.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "I_MPI_CXX=${cc.cc.CXX}"
+    "I_MPI_CXX=${cc.CXX}"
     "CPP_BIN=mpicxx"
   ];
 

garlic/apps/bigsort/shuffle.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "I_MPI_CXX=${cc.cc.CXX}"
+    "I_MPI_CXX=${cc.CXX}"
     "CPP_BIN=mpicxx"
   ];
 

garlic/apps/hpcg/default.nix

@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
   ++ optional (mpi != null) mpi;
 
   makeFlags = [
-    "CC=${cc.cc.CC}"
-    "CXX=${cc.cc.CXX}"
+    "CC=${cc.CC}"
+    "CXX=${cc.CXX}"
   ];
 
   enableParallelBuilding = true;

garlic/apps/nbody/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '' else "");
 
   makeFlags = [
-    "CC=${cc.cc.CC}"
+    "CC=${cc.CC}"
     "BS=${toString blocksize}"
   ]
   ++ optional (tampi != null) "TAMPI_HOME=${tampi}";

garlic/apps/saiph/default.nix

@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = [
-    "-f" "Makefile.${cc.cc.CC}"
+    "-f" "Makefile.${cc.CC}"
     "apps"
     "APP=Heat3D_vect"
   ] ++ optional (nbx != null) "NB_X=${toString nbx}"