diff options
Diffstat (limited to 'lib/make/configure')
| -rwxr-xr-x | lib/make/configure | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/lib/make/configure b/lib/make/configure index d017eefc..fb28ac10 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -1209,39 +1209,39 @@ test -n "$FPP" || FPP="echo" fi -if test -z "$NVCC" ; then +if test -z "$CUCC" ; then for ac_prog in nvcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:1219: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_NVCC'+set}'`\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CUCC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$NVCC"; then - ac_cv_prog_NVCC="$NVCC" # Let the user override the test. + if test -n "$CUCC"; then + ac_cv_prog_CUCC="$CUCC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_NVCC="$ac_prog" + ac_cv_prog_CUCC="$ac_prog" break fi done IFS="$ac_save_ifs" fi fi -NVCC="$ac_cv_prog_NVCC" -if test -n "$NVCC"; then - echo "$ac_t""$NVCC" 1>&6 +CUCC="$ac_cv_prog_CUCC" +if test -n "$CUCC"; then + echo "$ac_t""$CUCC" 1>&6 else echo "$ac_t""no" 1>&6 fi -test -n "$NVCC" && break +test -n "$CUCC" && break done fi @@ -1569,7 +1569,7 @@ fi # nvcc itself doesn't have warning flags. warnings will be given by C compilers. - : ${NVCC_WARN_FLAGS=''} + : ${CUCC_WARN_FLAGS=''} DEBUG_MODE='no' @@ -1598,7 +1598,7 @@ fi : ${F90_DEBUG_FLAGS='-g'} -: ${NVCC_DEBUG_FLAGS='-g'} +: ${CUCC_DEBUG_FLAGS='-g'} # Set the optimization flags if they've not been set by now # (using '-O2' as a reasonable default) @@ -1639,7 +1639,7 @@ fi : ${F90_NO_OPTIMISE_FLAGS='-O0'} -: ${NVCC_OPTIMISE_FLAGS='-O2'} +: ${CUCC_OPTIMISE_FLAGS='-O2'} # Set the profiling flags if they've not been set by now # (using '-pg' as a reasonable default) @@ -1664,7 +1664,7 @@ fi : ${F90_PROFILE_FLAGS='-pg'} -: ${NVCC_PROFILE_FLAGS='-pg'} +: ${CUCC_PROFILE_FLAGS='-pg'} # Set the OpenMP flags if they've not been set by now @@ -5847,10 +5847,10 @@ cat > conftest.$ac_ext <<EOF /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char KWoatp; +char louXr8; int main() { -Orn727 +zE45n3 ; return 0; } EOF if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then @@ -6402,7 +6402,7 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS" : ${F_DEPEND_OUT=' > $@'} -: ${CU_DEPEND='$(NVCC) -M'} +: ${CU_DEPEND='$(CUCC) -M'} : ${CU_DEPEND_OUT=' > $@'} @@ -6425,7 +6425,7 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS" : ${F90_POSTPROCESSING=''} -: ${NVCC_POSTPROCESSING=''} +: ${CUCC_POSTPROCESSING=''} # How to generate an intermediate C++ name (some compilers are very picky). @@ -6894,7 +6894,7 @@ s%@RANLIB@%$RANLIB%g s%@CPP@%$CPP%g s%@FPPFLAGS@%$FPPFLAGS%g s%@FPP@%$FPP%g -s%@NVCC@%$NVCC%g +s%@CUCC@%$CUCC%g s%@PERL@%$PERL%g s%@F90@%$F90%g s%@F77@%$F77%g @@ -6908,7 +6908,7 @@ s%@C_WARN_FLAGS@%$C_WARN_FLAGS%g s%@CXX_WARN_FLAGS@%$CXX_WARN_FLAGS%g s%@F77_WARN_FLAGS@%$F77_WARN_FLAGS%g s%@F90_WARN_FLAGS@%$F90_WARN_FLAGS%g -s%@NVCC_WARN_FLAGS@%$NVCC_WARN_FLAGS%g +s%@CUCC_WARN_FLAGS@%$CUCC_WARN_FLAGS%g s%@DEBUG_MODE@%$DEBUG_MODE%g s%@CPP_DEBUG_FLAGS@%$CPP_DEBUG_FLAGS%g s%@FPP_DEBUG_FLAGS@%$FPP_DEBUG_FLAGS%g @@ -6916,7 +6916,7 @@ s%@C_DEBUG_FLAGS@%$C_DEBUG_FLAGS%g s%@CXX_DEBUG_FLAGS@%$CXX_DEBUG_FLAGS%g s%@F77_DEBUG_FLAGS@%$F77_DEBUG_FLAGS%g s%@F90_DEBUG_FLAGS@%$F90_DEBUG_FLAGS%g -s%@NVCC_DEBUG_FLAGS@%$NVCC_DEBUG_FLAGS%g +s%@CUCC_DEBUG_FLAGS@%$CUCC_DEBUG_FLAGS%g s%@OPTIMISE_MODE@%$OPTIMISE_MODE%g s%@CPP_OPTIMISE_FLAGS@%$CPP_OPTIMISE_FLAGS%g s%@FPP_OPTIMISE_FLAGS@%$FPP_OPTIMISE_FLAGS%g @@ -6928,7 +6928,7 @@ s%@C_NO_OPTIMISE_FLAGS@%$C_NO_OPTIMISE_FLAGS%g s%@CXX_NO_OPTIMISE_FLAGS@%$CXX_NO_OPTIMISE_FLAGS%g s%@F77_NO_OPTIMISE_FLAGS@%$F77_NO_OPTIMISE_FLAGS%g s%@F90_NO_OPTIMISE_FLAGS@%$F90_NO_OPTIMISE_FLAGS%g -s%@NVCC_OPTIMISE_FLAGS@%$NVCC_OPTIMISE_FLAGS%g +s%@CUCC_OPTIMISE_FLAGS@%$CUCC_OPTIMISE_FLAGS%g s%@PROFILE_MODE@%$PROFILE_MODE%g s%@CPP_PROFILE_FLAGS@%$CPP_PROFILE_FLAGS%g s%@FPP_PROFILE_FLAGS@%$FPP_PROFILE_FLAGS%g @@ -6936,7 +6936,7 @@ s%@C_PROFILE_FLAGS@%$C_PROFILE_FLAGS%g s%@CXX_PROFILE_FLAGS@%$CXX_PROFILE_FLAGS%g s%@F77_PROFILE_FLAGS@%$F77_PROFILE_FLAGS%g s%@F90_PROFILE_FLAGS@%$F90_PROFILE_FLAGS%g -s%@NVCC_PROFILE_FLAGS@%$NVCC_PROFILE_FLAGS%g +s%@CUCC_PROFILE_FLAGS@%$CUCC_PROFILE_FLAGS%g s%@OPENMP_MODE@%$OPENMP_MODE%g s%@CPP_OPENMP_FLAGS@%$CPP_OPENMP_FLAGS%g s%@FPP_OPENMP_FLAGS@%$FPP_OPENMP_FLAGS%g @@ -6944,7 +6944,7 @@ s%@C_OPENMP_FLAGS@%$C_OPENMP_FLAGS%g s%@CXX_OPENMP_FLAGS@%$CXX_OPENMP_FLAGS%g s%@F77_OPENMP_FLAGS@%$F77_OPENMP_FLAGS%g s%@F90_OPENMP_FLAGS@%$F90_OPENMP_FLAGS%g -s%@NVCC_OPENMP_FLAGS@%$NVCC_OPENMP_FLAGS%g +s%@CUCC_OPENMP_FLAGS@%$CUCC_OPENMP_FLAGS%g s%@LIBDIR_PREFIX@%$LIBDIR_PREFIX%g s%@RUNDIR_PREFIX@%$RUNDIR_PREFIX%g s%@LIBLINK_PREFIX@%$LIBLINK_PREFIX%g @@ -6953,14 +6953,14 @@ s%@USE_RANLIB@%$USE_RANLIB%g s%@RANLIBFLAGS@%$RANLIBFLAGS%g s%@F90FLAGS@%$F90FLAGS%g s%@F77FLAGS@%$F77FLAGS%g -s%@NVCCFLAGS@%$NVCCFLAGS%g +s%@CUCCFLAGS@%$CUCCFLAGS%g s%@CPP_VERSION@%$CPP_VERSION%g s%@CC_VERSION@%$CC_VERSION%g s%@CXX_VERSION@%$CXX_VERSION%g s%@FPP_VERSION@%$FPP_VERSION%g s%@F77_VERSION@%$F77_VERSION%g s%@F90_VERSION@%$F90_VERSION%g -s%@NVCC_VERSION@%$NVCC_VERSION%g +s%@CUCC_VERSION@%$CUCC_VERSION%g s%@BUILD_GETOPT@%$BUILD_GETOPT%g s%@BUILD_REGEX@%$BUILD_REGEX%g s%@LIBDIRS@%$LIBDIRS%g @@ -7001,7 +7001,7 @@ s%@CXX_POSTPROCESSING@%$CXX_POSTPROCESSING%g s%@F77_POSTPROCESSING@%$F77_POSTPROCESSING%g s%@F_POSTPROCESSING@%$F_POSTPROCESSING%g s%@F90_POSTPROCESSING@%$F90_POSTPROCESSING%g -s%@NVCC_POSTPROCESSING@%$NVCC_POSTPROCESSING%g +s%@CUCC_POSTPROCESSING@%$CUCC_POSTPROCESSING%g s%@CXX_WORKING_NAME@%$CXX_WORKING_NAME%g s%@F90_SUFFIX@%$F90_SUFFIX%g s%@GET_WD@%$GET_WD%g |