Skip to content

Commit 15b4fc6

Browse files
committed
eliminate use of CXX_STD
1 parent 96c235c commit 15b4fc6

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/Makevars

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,16 @@ ifeq ($(OS), Windows_NT)
55

66
USE_TBB=Windows
77
TBB_COPY_PATTERN=tbb*.dll
8-
9-
CXX_STD = CXX11
10-
8+
119
else
1210

1311
UNAME := $(shell uname)
1412
TBB_COPY_PATTERN=libtbb*.*
1513
ifeq ($(UNAME), Darwin)
1614
USE_TBB=Mac
17-
# We don't set this on OS X because it caused build failures on
18-
# pre-Mavericks R toolchains (it was originally put in to prevent
19-
# warnings on a Linux toolchain so isn't needed on OS X anyway)
20-
# CXX_STD = CXX11
2115
endif
2216
ifeq ($(UNAME), Linux)
2317
USE_TBB=Linux
24-
CXX_STD = CXX11
2518
endif
2619
ifeq ($(UNAME), SunOS)
2720
USE_TBB=SunOS

0 commit comments

Comments
 (0)