Skip to content

clarify tbb install log messages #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinushey merged 1 commit into from
Jul 23, 2026
Merged

clarify tbb install log messages #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/install.libs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
if (.Platform$OS.type == "windows" && TBB_ENABLED) {
tbbDll <- file.path(tbbDest, "tbb.dll")
if (file.exists(tbbDll)) {
writeLines("** tbb.dll already exists; skipping tbb stub library")
writeLines("** tbb.dll already exists; skipping tbb.dll stub")
} else {
buildTbbStub(tbbDest)
}
Expand All @@ -108,17 +108,17 @@ buildTbbStub <- function(tbbDest) {

# with oneTBB, the stub provides the old TBB ABI's
# task_scheduler_observer entry point on top of the new runtime
writeLines("** creating tbb stub library")
writeLines("** creating tbb.dll stub (wrapping the oneTBB runtime)")
status <- system("R CMD SHLIB -o tbb-compat/tbb.dll tbb-compat/tbb-compat.cpp")
if (status != 0)
stop("error building tbb stub library")
stop("error building tbb.dll stub")

} else {

# with older versions of TBB (e.g. Rtools42), tbb-compat.cpp cannot
# build -- there is no oneTBB runtime to wrap -- but the static
# library already provides the old ABI, so re-export it wholesale
writeLines("** creating tbb stub library (from static tbb)")
writeLines("** creating tbb.dll stub (re-exporting the static tbb library)")

tbbLib <- Sys.getenv("TBB_LIB")
if (!nzchar(tbbLib))
Expand All @@ -137,7 +137,7 @@ buildTbbStub <- function(tbbDest) {
writeLines(command)
status <- system(command)
if (status != 0)
stop("error building tbb stub library")
stop("error building tbb.dll stub")

}

Expand All @@ -151,10 +151,10 @@ buildTbbStub <- function(tbbDest) {
# provenance easy to spot in installation logs.
logTbbLibraries <- function(tbbLibs, source) {
if (length(tbbLibs)) {
fmt <- "** copying tbb libraries from '%s' [%s]"
fmt <- "** copying tbb runtime libraries from '%s' [%s]"
writeLines(sprintf(fmt, source, paste(basename(tbbLibs), collapse = ", ")))
} else {
writeLines(sprintf("** no tbb libraries found in '%s'", source))
writeLines(sprintf("** no tbb runtime libraries found in '%s'", source))
}
}

Expand Down
Loading