Skip to content

rename systemFile() to archSystemFile() #252

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

rename systemFile() to archSystemFile() #252

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions R/tbb.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ tbbLibraryPath <- function(name = NULL) {
if (file.exists(tbbName))
return(tbbName)

tbbName <- systemFile("lib", libName)
tbbName <- archSystemFile("lib", libName)
if (file.exists(tbbName))
return(tbbName)

Expand Down Expand Up @@ -88,7 +88,7 @@ tbbLdFlags <- function() {
# on Windows, we statically link to oneTBB
if (is_windows()) {

libPath <- systemFile("libs")
libPath <- archSystemFile("libs")

ldFlags <- sprintf("-L%s -lRcppParallel", asBuildPath(libPath))
return(ldFlags)
Expand Down Expand Up @@ -123,6 +123,6 @@ tbbRoot <- function() {
if (nzchar(TBB_LIB))
return(TBB_LIB)

systemFile("lib")
archSystemFile("lib")

}
4 changes: 2 additions & 2 deletions R/utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# like system.file(), but injects the architecture-specific subdirectory
# used on Windows when set; e.g. systemFile("lib") resolves 'lib/x64'
systemFile <- function(dir, name = NULL) {
# used on Windows when set; e.g. archSystemFile("lib") resolves 'lib/x64'
archSystemFile <- function(dir, name = NULL) {
arch <- .Platform$r_arch
parts <- c(dir, if (nzchar(arch)) arch, name)
system.file(paste(parts, collapse = "/"), package = "RcppParallel")
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ loadTbbLibrary <- function(name) {
# 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
path <- systemFile("lib", paste0(name, ".dll"))
path <- archSystemFile("lib", paste0(name, ".dll"))
if (!file.exists(path))
return(NULL)

Expand Down
Loading