tweaks

Author: kevinushey

src/install.libs.R

@@ -76,7 +76,7 @@
          writeLines("** creating tbb stub library")
          status <- system("R CMD SHLIB tbb-compat/tbb-compat.cpp")
          if (status != 0)
-            stop("error build tbb stub library")
+            stop("error building tbb stub library")
          file.rename("tbb-compat/tbb-compat.dll", file.path(tbbDest, "tbb.dll"))
       }
    }
@@ -94,7 +94,7 @@ useTbbPreamble <- function(tbbInc) {
 }
 
 useSystemTbb <- function(tbbLib, tbbInc) {
-   writeLines("** using system-provided tbb installation")
+   useTbbPreamble(tbbInc)
 }
 
 useBundledTbb <- function() {

tools/config/configure.R

@@ -316,12 +316,12 @@ if (.Platform$OS.type == "windows" && is.na(tbbLib)) {
    define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=0")
 } else {
    define(TBB_ENABLED = TRUE)
-   define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=1 -DRCPP_PARALLEL_TBB_COMPAT=1")
+   define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=1")
 }
 
 # macOS needs some extra flags set
 if (Sys.info()[["sysname"]] == "Darwin") {
-   define(PKG_LIBS_EXTRA = "-Wl,-rpath,\"@loader_path/../lib\"")
+   define(PKG_LIBS_EXTRA = "-Wl,-rpath,@loader_path/../lib")
 } else {
    define(PKG_LIBS_EXTRA = "")
-}
+}