summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2016-03-03 14:20:28 +0100
committerWillem Jan Palenstijn <wjp@usecode.org>2016-03-03 14:20:28 +0100
commita924b809252a187d49635b72c8c36c31777137b4 (patch)
tree6b2599fd9d4fa1f798894c28f22c4c38d804b4a2 /build
parentf24d9457f56f60aa927600261500e4ca681d0033 (diff)
parenta27cb41f2d1dda5df3bf783fc5e2010552eb43be (diff)
downloadastra-a924b809252a187d49635b72c8c36c31777137b4.tar.gz
astra-a924b809252a187d49635b72c8c36c31777137b4.tar.bz2
astra-a924b809252a187d49635b72c8c36c31777137b4.tar.xz
astra-a924b809252a187d49635b72c8c36c31777137b4.zip
Merge pull request #33 from wjp/travis-test
Use travis-ci's apt packages for cuda
Diffstat (limited to 'build')
-rw-r--r--build/linux/Makefile.in6
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