Skip to content

Commit 811e884

Browse files
committed
Fix TBB library lookup
1 parent 4370a79 commit 811e884

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

R/tbb.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tbbLibraryPath <- function(name = NULL) {
2424
# form library names
2525
tbbLibNames <- list(
2626
"Darwin" = paste0("lib", name, ".dylib"),
27-
"Windows" = paste0( name, ".dll"),
27+
"Windows" = paste0("lib", name, c("12", ""), ".a"),
2828
"SunOS" = paste0("lib", name, ".so"),
2929
"Linux" = paste0("lib", name, c(".so.2", ".so"))
3030
)

R/zzz.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
.tbbMallocProxyDllInfo <- NULL
1212

1313
loadTbbLibrary <- function(name) {
14-
14+
# TBB is statically linked on Windows
15+
if (is_windows()) {
16+
return(NULL)
17+
}
1518
path <- tbbLibraryPath(name)
1619
if (is.null(path))
1720
return(NULL)

0 commit comments

Comments
 (0)