Skip to content

Commit d5d2cf3

Browse files
committed
only include $(CXX1XSTD) in inline plugin (packages have their own way of doing this)
1 parent 747c669 commit d5d2cf3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

R/build.R

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RcppParallelLibs <- function() {
3030
inlineCxxPlugin <- function() {
3131
list(
3232
env = list(
33-
PKG_CXXFLAGS = paste(tbbCxxFlags()),
33+
PKG_CXXFLAGS = paste("$(CXX1XSTD)", tbbCxxFlags()),
3434
PKG_LIBS = tbbLdFlags()
3535
),
3636
includes = "#include <RcppParallel.h>",
@@ -42,8 +42,7 @@ inlineCxxPlugin <- function() {
4242

4343
tbbCxxFlags <- function(simd = TRUE) {
4444

45-
# request use of C++11 when possible
46-
flags <- "$(CXX1XSTD)"
45+
flags <- c()
4746

4847
# opt-in to TBB on Windows
4948
if (Sys.info()['sysname'] == "Windows")

0 commit comments

Comments
 (0)