22321f2e58
This effectively reverts 86c283824f76d849acbe6
("If cuda headers are presented to nix [...]") and all the following
workarounds that was added due to that commit.
As far as I can tell[1] this hack isn't needed anymore. And moving
includes to $out/usr_include causes pain for cudatoolkit users, so
better get rid of it.
In patches that did more than the $out/usr_include workaround, I only
changed the line back to $out/include instead of re-generating the
patches and fully removing the changed line.
[1]: I build tested blender and caffe, and temporarily added
recurseIntoAttrs to rPackages and haskellPackages so that nox-review
could get proper coverage. However, many of the packages do not build
even before this patch. I also built CUDA samples with cudatoolkit7
that ran fine.
14 lines
432 B
Diff
14 lines
432 B
Diff
diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile
|
|
--- gputools_orig/src/Makefile 2013-05-09 01:43:32.000000000 +0900
|
|
+++ gputools/src/Makefile 2014-10-21 21:41:23.067148490 +0900
|
|
@@ -6,6 +6,9 @@
|
|
|
|
R_HOME := $(shell R RHOME)
|
|
|
|
+CUDA_INC := $(CUDA_HOME)/include
|
|
+CUDA_LIB := $(CUDA_HOME)/lib
|
|
+
|
|
#compiler/preprocessor options
|
|
INCS := -I. -I"$(CUDA_INC)" -I"$(R_INC)"
|
|
PARAMS := $(DEVICEOPTS) -Xcompiler $(CPICFLAGS)
|