diff options
author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-02-26 04:23:39 +0000 |
---|---|---|
committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-02-26 04:23:39 +0000 |
commit | ce7a824f4e47ec2e6c6429f81726c9dd772185c5 (patch) | |
tree | 4c7d9ccf1a6962d21ee4049f5c8fbfc77bbae58d /lib/make/make.config.rules.in | |
parent | a08107a97d6bda1ffcc7dcdc8e80ccd58f076134 (diff) |
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
Diffstat (limited to 'lib/make/make.config.rules.in')
-rw-r--r-- | lib/make/make.config.rules.in | 4 |
1 files changed, 2 insertions, 2 deletions
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 |