Merge branch 'master' of gitorious.psi.ch:scicomp/psi-modules-buildenvironment

scripts/OPAL.build

@@ -6,7 +6,7 @@ module use unstable
 
 # add -fopenmp to CC and CXX, if you want to compile with OpenMP
 function em.configure() {
-	CC="$MPICC" CXX="$MPICXX" cmake \
+	cmake \
 		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		-DENABLE_SAAMG_SOLVER=TRUE \

scripts/trilinos.build

@@ -5,13 +5,6 @@ source "$(dirname $0)/../lib/libem.bash"
 declare -rx AR=ar
 
 function em.configure() {
-	CC=$MPICC
-	CXX=$MPICXX
-	F77=$MPIF77
-	F90=$MPIF90
-	FC=$MPIFC
-	FORTRAN=$MPIFORTRAN
-
 	BLAS_PREFIX=$OPENBLAS_PREFIX
 	LAPACK_PREFIX=$OPENBLAS_PREFIX