Commit e75a4d7a authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Adjust Cray cross build script to use newer Intel compiler

parent 4e1e0c4d
...@@ -33,12 +33,13 @@ else ...@@ -33,12 +33,13 @@ else
fi fi
. /opt/modules/default/init/bash . /opt/modules/default/init/bash
module purge 1>/dev/null 2>/dev/null module purge 1>/dev/null 2>/dev/null
module load modules ${EXTRA_MODULES} gcc PrgEnv-${COMP} craype-${CPU} cray-mpich cray-hdf5 module load modules gcc
export CC=gcc export CC=$(which gcc)
export CXX=g++ export CXX=$(which g++)
export FC=gfortran export FC=$(which gfortran)
mkdir tools mkdir tools
cd tools cd tools
...@@ -57,9 +58,21 @@ ${CMAKE} \ ...@@ -57,9 +58,21 @@ ${CMAKE} \
-DENABLE_bzip2:BOOL=TRUE \ -DENABLE_bzip2:BOOL=TRUE \
-DUSE_SYSTEM_bzip2:BOOL=TRUE \ -DUSE_SYSTEM_bzip2:BOOL=TRUE \
-Ddownload_location:PATH=${DOWN} \ -Ddownload_location:PATH=${DOWN} \
-DPV_MAKE_NCPUS=12 \
${SRC} ${SRC}
make make
module purge 1>/dev/null 2>/dev/null
module load modules ${EXTRA_MODULES} PrgEnv-${COMP} craype-${CPU} cray-mpich cray-hdf5
if [ "${COMP}" = "intel" ]
then
# We still need the gcc module with the Intel compiler so we can get C++11 headers
module load gcc
# Use a newer Intel compiler
module swap intel intel/15.0.5.223
fi
unset CC unset CC
unset CXX unset CXX
unset FC unset FC
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment