From 7622314660896ea77c4a906cf6d8ed91dcd535cd Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 12 Jan 2015 18:39:54 +0100 Subject: [PATCH 1/3] OPAL 1.3.0 tar-ball added From 2b53fbcc8d71e71e91cce68182e337691b77290c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 12 Jan 2015 18:41:01 +0100 Subject: [PATCH 2/3] scripts/OPAL.build: do NOT set CC and CXX to MPI wrappers --- scripts/OPAL.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/OPAL.build b/scripts/OPAL.build index e787f5a..27c8d8b 100755 --- a/scripts/OPAL.build +++ b/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 \ From bb5c3859010922fc3f6620a64f1c6f7e66335756 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 12 Jan 2015 18:42:07 +0100 Subject: [PATCH 3/3] scripts/trilinos.build: remove setting of CC, CXX and co --- scripts/trilinos.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/trilinos.build b/scripts/trilinos.build index 1af86fd..a79f5b0 100755 --- a/scripts/trilinos.build +++ b/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