projects
/
platform
/
upstream
/
caffeonacl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f623d04
)
fix grep in CUDA version detection to accomodate OSX's grep (and other grep that...
author
Sheng Zha
<szha@umd.edu>
Sat, 30 Apr 2016 23:40:05 +0000
(16:40 -0700)
committer
Sheng Zha
<szha@umd.edu>
Sat, 30 Apr 2016 23:40:05 +0000
(16:40 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
5424c3a
..
568d9c2
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-272,7
+272,7
@@
endif
ifeq ($(OSX), 1)
CXX := /usr/bin/clang++
ifneq ($(CPU_ONLY), 1)
- CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release
\d' | grep -o '\d
')
+ CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release
[0-9.]*' | grep -o '[0-9.]*
')
ifeq ($(shell echo | awk '{exit $(CUDA_VERSION) < 7.0;}'), 1)
CXXFLAGS += -stdlib=libstdc++
LINKFLAGS += -stdlib=libstdc++