Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ loadTbbLibrary <- function(name) {
# DLL search path.
if (is_windows()) {

path <- file.path(tbbRoot(), paste0(name, ".dll"))
# NOTE: resolve against the package's own library directory, where
# install.libs.R places the stub; tbbRoot() would prefer TBB_LIB,
# which on Windows points at Rtools and holds only static libraries
arch <- .Platform$r_arch
parts <- c("lib", if (nzchar(arch)) arch, paste0(name, ".dll"))
path <- system.file(paste(parts, collapse = "/"), package = "RcppParallel")
if (!file.exists(path))
return(NULL)

Expand Down
Loading