diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-03-01 17:24:33 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-03-03 13:55:38 +0100 |
| commit | ac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6 (patch) | |
| tree | 73e1a5e9fac9120ae06d6c339d9b114c6338f63a | |
| parent | 14bef5ea534e4aa4e6d0819e728d0a8d2b0b7925 (diff) | |
| download | astra-ac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6.tar.gz astra-ac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6.tar.bz2 astra-ac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6.tar.xz astra-ac5d33197f5e1e07327ba1f7eee8b1c91fad2fe6.zip | |
Revert "Use nvcc's -MT option"
This reverts commit 29c5c86e56697286a92031aaa9fdd903b3bcc426.
This fixes building with CUDA 5.5.
| -rw-r--r-- | build/linux/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 9535b4c..951e9f0 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -315,8 +315,10 @@ ifeq ($(cuda),yes) ifeq ($(gen_static_libs),yes) @$(NVCC) $(NVCCFLAGS) -c $(<) -o $*.o >/dev/null 2>&1 endif - @# Generate a .d file, with target name $*.lo - @$(NVCC) $(NVCCFLAGS) -M $(<) -MT $(*F).lo -odir $(*D) -o $(*D)/$(DEPDIR)/$(*F).d + @# Generate a .d file, and change the target name in it from .o to .lo + @$(NVCC) $(NVCCFLAGS) -M $(<) -odir $(*D) -o $(*D)/$(DEPDIR)/$(*F).d2 + @sed '1s/\.o :/.lo :/' < $(*D)/$(DEPDIR)/$(*F).d2 > $(*D)/$(DEPDIR)/$(*F).d + @rm -f $(*D)/$(DEPDIR)/$(*F).d2 @# Generate empty targets for all dependencies listed in the .d file. @# This mimics gcc's -MP option. @for x in `cat $(*D)/$(DEPDIR)/$(*F).d`; do if test a$$x != a: -a a$$x != a\\; then echo -e "\n$$x:\n" >> $(*D)/$(DEPDIR)/$(*F).d; fi; done |