Skip to content

Commit 0acb8db

Browse files
committed
Merge pull request BVLC#4146 from yalesong/fix-makefile-osx-yosemite
Fix Makefile CUDA_VERSION extraction on OSX Yosemite
2 parents 5f21dad + 87c9dc3 commit 0acb8db

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ endif
272272
ifeq ($(OSX), 1)
273273
CXX := /usr/bin/clang++
274274
ifneq ($(CPU_ONLY), 1)
275-
CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release [0-9.]*' | grep -o '[0-9.]*')
275+
CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release [0-9.]*' | tr -d '[a-z ]')
276276
ifeq ($(shell echo | awk '{exit $(CUDA_VERSION) < 7.0;}'), 1)
277277
CXXFLAGS += -stdlib=libstdc++
278278
LINKFLAGS += -stdlib=libstdc++

0 commit comments

Comments
 (0)