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

1 files changed, 16 insertions, 16 deletions

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.