◐ Shell
reader mode source ↗
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
4 changes: 4 additions & 0 deletions R/tbb.R
Original file line number Diff line number Diff line change
@@ -110,6 +110,10 @@ tbbLdFlags <- function() {
# shortcut if TBB_LIB defined
tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
if (nzchar(tbbLib)) {
fmt <- "-L%1$s -Wl,-rpath,%1$s -l%2$s -l%3$s"
return(sprintf(fmt, asBuildPath(tbbLib), TBB_NAME, TBB_MALLOC_NAME))
}
Expand Down
18 changes: 18 additions & 0 deletions src/install.libs.R
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
Darwin = "^libtbb.*\\.dylib$",
"^libtbb.*\\.so.*$"
)

if (!nzchar(tbbLib)) {

Expand Down Expand Up @@ -114,6 +118,15 @@ useBundledTbb <- function() {
".."
)

writeLines("*** configuring tbb")
owd <- setwd("tbb/build-tbb")
output <- system2(cmake, shQuote(cmakeFlags), stdout = TRUE, stderr = TRUE)
Expand Down Expand Up @@ -145,6 +158,11 @@ useBundledTbb <- function() {
"^libtbb.*\\.so.*$"
)

tbbFiles <- list.files(
file.path(getwd(), "tbb/build-tbb"),
pattern = shlibPattern,
Expand Down
19 changes: 12 additions & 7 deletions tools/config/configure.R
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,18 @@ pkgLibs <- if (!is.na(tbbLib)) {
NULL

} else {

c(
"-Wl,-Ltbb/build/lib_release",
"-l$(TBB_NAME)",
"-l$(TBB_MALLOC_NAME)"
)

}


Expand Down
Loading
Toggle all file notes Toggle all file annotations