- don't try to read the LIBS info from ROMIO's configure script if running
the script did not complete successfully - ROMIO likes to default to using the system compiler if no compiler is specified. This can lead to using a different compiler for ROMIO as for Open MPI, which is not always a good thing. Reset the default to behave the same way Open MPI does. This commit was SVN r8380.
Этот коммит содержится в:
родитель
3f396aeae9
Коммит
7998cca0f3
@ -56,7 +56,8 @@ AC_DEFUN([MCA_io_romio_CONFIG],[
|
||||
[$io_romio_flags],
|
||||
[io_romio_happy=1], [io_romio_happy=0])
|
||||
|
||||
# grab the libraries list from ROMIO. We don't
|
||||
AS_IF([test "$io_romio_happy" = "1"],
|
||||
[ # grab the libraries list from ROMIO. We don't
|
||||
# need this for building the component, as libtool
|
||||
# will figure that part out. But we do need it for
|
||||
# the wrapper settings
|
||||
@ -66,8 +67,7 @@ AC_DEFUN([MCA_io_romio_CONFIG],[
|
||||
io_romio_LIBS="$LIBS"
|
||||
LIBS="$io_romio_save_LIBS"
|
||||
|
||||
AS_IF([test "$io_romio_happy" = "1"],
|
||||
[echo "ROMIO distribution configured successfully"
|
||||
echo "ROMIO distribution configured successfully"
|
||||
io_romio_WRAPPER_EXTRA_LIBS="$io_romio_LIBS"
|
||||
$1],
|
||||
[AC_MSG_WARN([ROMIO distribution did not configure successfully])
|
||||
|
@ -387,27 +387,28 @@ fi
|
||||
if test -n "$OPTFLAGSC" ; then
|
||||
C_OPT_FLAG="$C_OPT_FLAG $OPTFLAGSC"
|
||||
fi
|
||||
# Open MPI: ignore all setting of CC, f77, FC, etc. in this section
|
||||
case $ARCH in
|
||||
solaris|solaris86)
|
||||
CC=${CC:-cc}
|
||||
F77=${FC:-f77}
|
||||
#CC=${CC:-cc}
|
||||
#F77=${FC:-f77}
|
||||
if test "$CC" != "gcc" ; then
|
||||
C_DEBUG_FLAG="-g -v"
|
||||
fi
|
||||
;;
|
||||
|
||||
rs6000)
|
||||
F77=${FC}
|
||||
#F77=${FC}
|
||||
# Try to use mpcc if no CC specified
|
||||
AC_PROGRAMS_CHECK(CC, mpcc, cc)
|
||||
if test $NOF77 = 0 && test -z "$F77"; then
|
||||
AC_PROGRAMS_CHECK(F77, mpxlf, f77)
|
||||
fi
|
||||
#AC_PROGRAMS_CHECK(CC, mpcc, cc)
|
||||
#if test $NOF77 = 0 && test -z "$F77"; then
|
||||
# AC_PROGRAMS_CHECK(F77, mpxlf, f77)
|
||||
#fi
|
||||
;;
|
||||
|
||||
tflop|tflops)
|
||||
CC=${CC:-pgcc}
|
||||
F77=${FC:-pgf77}
|
||||
#CC=${CC:-pgcc}
|
||||
#F77=${FC:-pgf77}
|
||||
CFLAGS="$CFLAGS -cougar -D__PUMA"
|
||||
if test "$CC" = "pgcc" ; then
|
||||
C_OPT_FLAG="-Knoieee -Mvect -O3"
|
||||
@ -415,18 +416,18 @@ case $ARCH in
|
||||
;;
|
||||
|
||||
freebsd|LINUX|netbsd|openbsd|LINUX_ALPHA)
|
||||
CC=${CC:-gcc}
|
||||
#CC=${CC:-gcc}
|
||||
# Let the prog_f77 file g77/f77/others
|
||||
F77=${FC}
|
||||
#F77=${FC}
|
||||
;;
|
||||
|
||||
SX4)
|
||||
CC=${CC:-mpicc}
|
||||
F77=${FC:-mpif90}
|
||||
if test $DEBUG != "yes" ; then
|
||||
USER_FFLAGS="$FFLAGS -Chopt"
|
||||
F77_OPT_FLAG="-Chopt"
|
||||
fi
|
||||
#CC=${CC:-mpicc}
|
||||
#F77=${FC:-mpif90}
|
||||
#if test $DEBUG != "yes" ; then
|
||||
# USER_FFLAGS="$FFLAGS -Chopt"
|
||||
# F77_OPT_FLAG="-Chopt"
|
||||
#fi
|
||||
;;
|
||||
|
||||
hpux|sppux)
|
||||
@ -434,24 +435,24 @@ case $ARCH in
|
||||
;;
|
||||
|
||||
alpha|ALPHA)
|
||||
CC=${CC:-cc}
|
||||
F77=${FC:-f77}
|
||||
dnl CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
|
||||
C_DEBUG_FLAG="-g -verbose"
|
||||
#CC=${CC:-cc}
|
||||
#F77=${FC:-f77}
|
||||
#dnl CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
|
||||
#C_DEBUG_FLAG="-g -verbose"
|
||||
;;
|
||||
|
||||
CRAY)
|
||||
CC=${CC:-cc}
|
||||
F77=${FC:-f90}
|
||||
NOF77=1
|
||||
#CC=${CC:-cc}
|
||||
#F77=${FC:-f90}
|
||||
#NOF77=1
|
||||
CFLAGS="$CFLAGS -D_UNICOS"
|
||||
;;
|
||||
|
||||
sgi|IRIX64|IRIX32|IRIXN32)
|
||||
arch_IRIX=1
|
||||
CC=${CC:-cc}
|
||||
F77=${FC:-f77}
|
||||
C_DEBUG_FLAG="-g -fullwarn"
|
||||
#CC=${CC:-cc}
|
||||
#F77=${FC:-f77}
|
||||
#C_DEBUG_FLAG="-g -fullwarn"
|
||||
;;
|
||||
|
||||
sgi5)
|
||||
@ -459,7 +460,7 @@ case $ARCH in
|
||||
|
||||
*)
|
||||
# Fall-through case. Take FC
|
||||
F77=${FC:-f77}
|
||||
#F77=${FC:-f77}
|
||||
;;
|
||||
esac
|
||||
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user