Commit 63ade47e authored by cyrush's avatar cyrush

build_visit: merge uintah and par changes from 2.7RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23406 18c085ea-50e0-402c-830e-de6fd14e8384
parent 1f2420cc
......@@ -135,9 +135,11 @@ function build_mpich
MPICH_CXX_OPT_FLAGS=`echo $CXX_OPT_FLAGS | sed -e 's/-fno-common//g'`
MPICH_FCFLAGS=`echo $FCFLAGS | sed -e 's/-fno-common//g'`
info "HERE $MPICH_CFLAGS"
info "HERE $MPICH_CXXFLAGS"
# disable fortran if we don't have a fortran compiler
if [[ "$FC_COMPILER" == "no" ]] ; then
mpich_opts="${mpich_opts} --disable-fc --disable-f77"
fi
issue_command env CXX="$CXX_COMPILER" \
CC="$C_COMPILER" \
......
......@@ -208,12 +208,10 @@ function build_uintah
if [[ "$FC_COMPILER" == "no" ]] ; then
if [[ "$OPSYS" != "Darwin" ]]; then
warn "Uintah may require fortran to be enabled. It does not appear that the --fortran "
warn "agrument was set. If Uintah fails to build try adding the --fortranargument"
FORTRANARGS=""
# return 1
fi
FORTRANARGS="--without-fortran"
#return 1
else
FORTRANARGS="FC=\"$FC_COMPILER\" F77=\"$FC_COMPILER\" FCFLAGS=\"$FCFLAGS\" FFLAGS=\"$FCFLAGS\" --enable-fortran"
......
......@@ -970,6 +970,21 @@ function check_parallel
return 0
fi
#
# VisIt's build_visit can obtain all necessary MPI flags from
# bv_mpich. If we are building mpich and the user
# did not set PAR_LIBS or PAR_INCLUDE we are done.
#
if [[ "$DO_MPICH" == "yes" && "$PAR_INCLUDE" == "" && "$PAR_LIBS" == "" && "$MPIWRAPPER" == "" ]] ; then
export MPICH_COMPILER="${VISITDIR}/mpich/$MPICH_VERSION/${VISITARCH}/bin/mpicc"
export VISIT_MPI_COMPILER="$MPICH_COMPILER"
export PAR_COMPILER="$MPICH_COMPILER"
info \
"Configuring with build mpich: $MPICH_COMPILER"
return 0
fi
#
# Check the environment that mpicc would set up as a first stab.
# Since VisIt currently only ever uses MPI's C interface, we need
......
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