patch from Jian Tao: The configuration option to specify the CUDA C compiler should be called CUCC, not NVCC. nvcc is only NVidia's CUDA C compiler.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4685 17b73243-c579-4c4c-a9d2-2d5706c11dac

4 files changed, 60 insertions, 60 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
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 9b7966b0..2460b99a 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -193,8 +193,8 @@ if test -z "$FPP" ; then
   AC_PATH_PROGS(FPP, cpp, echo, /lib:/usr/lib:/usr/local/lib:$PATH)
 fi
 
-if test -z "$NVCC" ; then
-  AC_CHECK_PROGS(NVCC, nvcc)
+if test -z "$CUCC" ; then
+  AC_CHECK_PROGS(CUCC, nvcc)
 fi
 
 if test -z "$PERL" ; then
@@ -312,8 +312,8 @@ else
 fi
 
 # nvcc itself doesn't have warning flags. warnings will be given by C compilers.
-AC_SUBST(NVCC_WARN_FLAGS)
-  : ${NVCC_WARN_FLAGS=''}
+AC_SUBST(CUCC_WARN_FLAGS)
+  : ${CUCC_WARN_FLAGS=''}
 
 AC_SUBST(DEBUG_MODE)
 DEBUG_MODE='no'
@@ -341,8 +341,8 @@ AC_SUBST(F77_DEBUG_FLAGS)
 AC_SUBST(F90_DEBUG_FLAGS)
 : ${F90_DEBUG_FLAGS='-g'}
 
-AC_SUBST(NVCC_DEBUG_FLAGS)
-: ${NVCC_DEBUG_FLAGS='-g'}
+AC_SUBST(CUCC_DEBUG_FLAGS)
+: ${CUCC_DEBUG_FLAGS='-g'}
 
 # Set the optimization flags if they've not been set by now
 # (using '-O2' as a reasonable default)
@@ -382,8 +382,8 @@ AC_SUBST(F77_NO_OPTIMISE_FLAGS)
 AC_SUBST(F90_NO_OPTIMISE_FLAGS)
 : ${F90_NO_OPTIMISE_FLAGS='-O0'}
 
-AC_SUBST(NVCC_OPTIMISE_FLAGS)
-: ${NVCC_OPTIMISE_FLAGS='-O2'}
+AC_SUBST(CUCC_OPTIMISE_FLAGS)
+: ${CUCC_OPTIMISE_FLAGS='-O2'}
 
 # Set the profiling flags if they've not been set by now
 # (using '-pg' as a reasonable default)
@@ -407,8 +407,8 @@ AC_SUBST(F77_PROFILE_FLAGS)
 AC_SUBST(F90_PROFILE_FLAGS)
 : ${F90_PROFILE_FLAGS='-pg'}
 
-AC_SUBST(NVCC_PROFILE_FLAGS)
-: ${NVCC_PROFILE_FLAGS='-pg'}
+AC_SUBST(CUCC_PROFILE_FLAGS)
+: ${CUCC_PROFILE_FLAGS='-pg'}
 
 # Set the OpenMP flags if they've not been set by now
 AC_SUBST(OPENMP_MODE)
@@ -419,7 +419,7 @@ AC_SUBST(C_OPENMP_FLAGS)
 AC_SUBST(CXX_OPENMP_FLAGS)
 AC_SUBST(F77_OPENMP_FLAGS)
 AC_SUBST(F90_OPENMP_FLAGS)
-AC_SUBST(NVCC_OPENMP_FLAGS)
+AC_SUBST(CUCC_OPENMP_FLAGS)
 
 ##########################################################################
 
@@ -575,7 +575,7 @@ AC_SUBST(RANLIBFLAGS)
 
 AC_SUBST(F90FLAGS)
 AC_SUBST(F77FLAGS)
-AC_SUBST(NVCCFLAGS)
+AC_SUBST(CUCCFLAGS)
 
 #: ${F90FLAGS="$CFLAGS"}
 #: ${F77FLAGS="$CFLAGS"}
@@ -586,7 +586,7 @@ AC_SUBST(CXX_VERSION)
 AC_SUBST(FPP_VERSION)
 AC_SUBST(F77_VERSION)
 AC_SUBST(F90_VERSION)
-AC_SUBST(NVCC_VERSION)
+AC_SUBST(CUCC_VERSION)
 
 dnl Checks for library functions.
 
@@ -1190,7 +1190,7 @@ AC_SUBST(F_DEPEND_OUT)
 : ${F_DEPEND_OUT=' > $@'}
 
 AC_SUBST(CU_DEPEND)
-: ${CU_DEPEND='$(NVCC) -M'}
+: ${CU_DEPEND='$(CUCC) -M'}
 AC_SUBST(CU_DEPEND_OUT)
 : ${CU_DEPEND_OUT=' > $@'}
 
@@ -1212,8 +1212,8 @@ AC_SUBST(F_POSTPROCESSING)
 : ${F_POSTPROCESSING=''}
 AC_SUBST(F90_POSTPROCESSING)
 : ${F90_POSTPROCESSING=''}
-AC_SUBST(NVCC_POSTPROCESSING)
-: ${NVCC_POSTPROCESSING=''}
+AC_SUBST(CUCC_POSTPROCESSING)
+: ${CUCC_POSTPROCESSING=''}
 
 # How to generate an intermediate C++ name (some compilers are very picky).
 AC_SUBST(CXX_WORKING_NAME)
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index b3b02abc..05e8d5bd 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -25,7 +25,7 @@ export CC          = @CC@
 export CXX         = @CXX@
 export F90         = @F90@
 export F77         = @F77@
-export NVCC        = @NVCC@
+export CUCC        = @CUCC@
 export CPP         = @CPP@
 export FPP         = @FPP@
 export LD          = @LD@
@@ -37,7 +37,7 @@ export CFLAGS      = @CFLAGS@
 export CXXFLAGS    = @CXXFLAGS@
 export F90FLAGS    = @F90FLAGS@
 export F77FLAGS    = @F77FLAGS@
-export NVCCFLAGS   = @NVCCFLAGS@
+export CUCCFLAGS   = @CUCCFLAGS@
 export CPPFLAGS    = @CPPFLAGS@
 export FPPFLAGS    = @FPPFLAGS@
 
@@ -51,7 +51,7 @@ export F_LINE_DIRECTIVES = @F_LINE_DIRECTIVES@
 # FPP: @FPP_VERSION@
 # F77: @F77_VERSION@
 # F90: @F90_VERSION@
-# NVCC: @NVCC_VERSION@
+# CUCC: @CUCC_VERSION@
 
 export MKDIRFLAGS  = @MKDIRFLAGS@
 
@@ -70,7 +70,7 @@ export C_DEBUG_FLAGS   = @C_DEBUG_FLAGS@
 export CXX_DEBUG_FLAGS = @CXX_DEBUG_FLAGS@
 export F90_DEBUG_FLAGS = @F90_DEBUG_FLAGS@
 export F77_DEBUG_FLAGS = @F77_DEBUG_FLAGS@
-export NVCC_DEBUG_FLAGS = @NVCC_DEBUG_FLAGS@
+export CUCC_DEBUG_FLAGS = @CUCC_DEBUG_FLAGS@
 
 # Optimisation flags
 export CPP_OPTIMISE_FLAGS = @CPP_OPTIMISE_FLAGS@
@@ -79,14 +79,14 @@ export C_OPTIMISE_FLAGS   = @C_OPTIMISE_FLAGS@
 export CXX_OPTIMISE_FLAGS = @CXX_OPTIMISE_FLAGS@
 export F90_OPTIMISE_FLAGS = @F90_OPTIMISE_FLAGS@
 export F77_OPTIMISE_FLAGS = @F77_OPTIMISE_FLAGS@
-export NVCC_OPTIMISE_FLAGS = @NVCC_OPTIMISE_FLAGS@
+export CUCC_OPTIMISE_FLAGS = @CUCC_OPTIMISE_FLAGS@
 
 # No-optimisation flags
 export C_NO_OPTIMISE_FLAGS   = @C_NO_OPTIMISE_FLAGS@
 export CXX_NO_OPTIMISE_FLAGS = @CXX_NO_OPTIMISE_FLAGS@
 export F90_NO_OPTIMISE_FLAGS = @F90_NO_OPTIMISE_FLAGS@
 export F77_NO_OPTIMISE_FLAGS = @F77_NO_OPTIMISE_FLAGS@
-export NVCC_NO_OPTIMISE_FLAGS = @NVCC_NO_OPTIMISE_FLAGS@
+export CUCC_NO_OPTIMISE_FLAGS = @CUCC_NO_OPTIMISE_FLAGS@
 
 # Profiling flags
 export CPP_PROFILE_FLAGS = @CPP_PROFILE_FLAGS@
@@ -95,7 +95,7 @@ export C_PROFILE_FLAGS   = @C_PROFILE_FLAGS@
 export CXX_PROFILE_FLAGS = @CXX_PROFILE_FLAGS@
 export F90_PROFILE_FLAGS = @F90_PROFILE_FLAGS@
 export F77_PROFILE_FLAGS = @F77_PROFILE_FLAGS@
-export NVCC_PROFILE_FLAGS = @NVCC_PROFILE_FLAGS@
+export CUCC_PROFILE_FLAGS = @CUCC_PROFILE_FLAGS@
 
 # OpenMP flags
 export CPP_OPENMP_FLAGS = @CPP_OPENMP_FLAGS@
@@ -104,7 +104,7 @@ export C_OPENMP_FLAGS   = @C_OPENMP_FLAGS@
 export CXX_OPENMP_FLAGS = @CXX_OPENMP_FLAGS@
 export F90_OPENMP_FLAGS = @F90_OPENMP_FLAGS@
 export F77_OPENMP_FLAGS = @F77_OPENMP_FLAGS@
-export NVCC_OPENMP_FLAGS = @NVCC_OPENMP_FLAGS@
+export CUCC_OPENMP_FLAGS = @CUCC_OPENMP_FLAGS@
 
 # Warning flags
 export CPP_WARN_FLAGS = @CPP_WARN_FLAGS@
@@ -113,7 +113,7 @@ export C_WARN_FLAGS   = @C_WARN_FLAGS@
 export CXX_WARN_FLAGS = @CXX_WARN_FLAGS@
 export F90_WARN_FLAGS = @F90_WARN_FLAGS@
 export F77_WARN_FLAGS = @F77_WARN_FLAGS@
-export NVCC_WARN_FLAGS = @NVCC_WARN_FLAGS@
+export CUCC_WARN_FLAGS = @CUCC_WARN_FLAGS@
 
 # Most compilers use -c -o to compile only, some do something different
 export CCOMPILEONLY = @CCOMPILEONLY@
@@ -163,7 +163,7 @@ export CXX_POSTPROCESSING = @CXX_POSTPROCESSING@
 export F77_POSTPROCESSING = @F77_POSTPROCESSING@
 export F_POSTPROCESSING   = @F_POSTPROCESSING@
 export F90_POSTPROCESSING = @F90_POSTPROCESSING@
-export NVCC_POSTPROCESSING = @NVCC_POSTPROCESSING@
+export CUCC_POSTPROCESSING = @CUCC_POSTPROCESSING@
 
 # Do we need to use ranlib ?
 export USE_RANLIB = @USE_RANLIB@
@@ -234,7 +234,7 @@ ifeq ($(strip $(CCTK_DEBUG_MODE)),yes)
   CXXFLAGS += $(CXX_DEBUG_FLAGS)
   F77FLAGS += $(F77_DEBUG_FLAGS)
   F90FLAGS += $(F90_DEBUG_FLAGS)
-  NVCCFLAGS += $(NVCC_DEBUG_FLAGS)
+  CUCCFLAGS += $(CUCC_DEBUG_FLAGS)
 endif
 
 # Is this an optimising configuration ?
@@ -247,13 +247,13 @@ ifeq ($(strip $(CCTK_OPTIMISE_MODE)),yes)
   CXXFLAGS += $(CXX_OPTIMISE_FLAGS)
   F77FLAGS += $(F77_OPTIMISE_FLAGS)
   F90FLAGS += $(F90_OPTIMISE_FLAGS)
-  NVCCFLAGS += $(NVCC_OPTIMISE_FLAGS)
+  CUCCFLAGS += $(CUCC_OPTIMISE_FLAGS)
 else
   CFLAGS   += $(C_NO_OPTIMISE_FLAGS)
   CXXFLAGS += $(CXX_NO_OPTIMISE_FLAGS)
   F77FLAGS += $(F77_NO_OPTIMISE_FLAGS)
   F90FLAGS += $(F90_NO_OPTIMISE_FLAGS)
-  NVCCFLAGS += $(NVCC_NO_OPTIMISE_FLAGS)
+  CUCCFLAGS += $(CUCC_NO_OPTIMISE_FLAGS)
 endif
 
 # Is this a profiling configuration ?
@@ -266,7 +266,7 @@ ifeq ($(strip $(CCTK_PROFILE_MODE)),yes)
   CXXFLAGS += $(CXX_PROFILE_FLAGS)
   F77FLAGS += $(F77_PROFILE_FLAGS)
   F90FLAGS += $(F90_PROFILE_FLAGS)
-  NVCCFLAGS += $(NVCC_PROFILE_FLAGS)
+  CUCCFLAGS += $(CUCC_PROFILE_FLAGS)
 endif
 
 # Are we building with OpenMP support ?
@@ -279,7 +279,7 @@ ifeq ($(strip $(CCTK_OPENMP_MODE)),yes)
   CXXFLAGS += $(CXX_OPENMP_FLAGS)
   F77FLAGS += $(F77_OPENMP_FLAGS)
   F90FLAGS += $(F90_OPENMP_FLAGS)
-  NVCCFLAGS += $(NVCC_OPENMP_FLAGS)
+  CUCCFLAGS += $(CUCC_OPENMP_FLAGS)
 endif
 
 # Are we building with all warnings switched on ?
@@ -297,7 +297,7 @@ ifeq ($(strip $(CCTK_WARN_MODE)),yes)
   CXXFLAGS += $(CXX_WARN_FLAGS)
   F77FLAGS += $(F77_WARN_FLAGS)
   F90FLAGS += $(F90_WARN_FLAGS)
-  NVCCFLAGS += $(NVCC_WARN_FLAGS)
+  CUCCFLAGS += $(CUCC_WARN_FLAGS)
 endif
 
 # Stuff specific to an architecture.
diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index e4f9ddf3..a909e367 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -96,11 +96,11 @@ endef
 # preporcess and postprocess are currently set the same as C.
 define PREPROCESS_CU
 { if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(PERL) -s $(C_FILE_PROCESSOR) -line_directives=$(C_LINE_DIRECTIVES) -source_file_name=$< $(CONFIG) > $(notdir $<)
-#{ if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(NVCC) -E $< $(INCLUDE_LINE) > $(notdir $<)
+#{ if test $(C_LINE_DIRECTIVES) = 'yes'; then echo '#line 1 "'$<'"'; fi; cat $<; } | $(CUCC) -E $< $(INCLUDE_LINE) > $(notdir $<)
 endef
 
 define COMPILE_CU
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(NVCC) $(NVCCFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE 
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CUCC) $(CUCCFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INCLUDE_LINE) $(EXTRA_DEFINES:%=-D%) -DCCODE 
 endef
 
 define POSTPROCESS_CU