maintain compatibility with rstan

Author: kevinushey

R/tbb.R

@@ -98,8 +98,13 @@ tbbLdFlags <- function() {
 }
 
 tbbRoot <- function() {
+   
+   # TODO: rstan
+   # parts <- c("libs", if (nzchar(rArch)) rArch, "tbb")
+   
    rArch <- .Platform$r_arch
-   parts <- c("libs", if (nzchar(rArch)) rArch, "tbb")
+   parts <- c("lib/tbb", if (nzchar(rArch)) rArch)
    libDir <- paste(parts, collapse = "/")
    system.file(libDir, package = "RcppParallel")
+   
 }

src/install.libs.R

@@ -10,7 +10,8 @@
       file.copy("symbols.rds", dest, overwrite = TRUE)
 
    # copy tbb
-   tbbDest <- file.path(dest, "tbb")
+   # TODO: use 'dest' library directory once rstan is updated
+   tbbDest <- file.path(R_PACKAGE_DIR, "lib/tbb", R_ARCH)
    dir.create(tbbDest, recursive = TRUE, showWarnings = FALSE)
 
    # check for bundled vs. system tbb