Skip to content

Commit 53bb834

Browse files
committed
install to ../inst/lib
1 parent 5996beb commit 53bb834

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

R/hooks.R renamed to R/zzz.R

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ loadTbbLibrary <- function(name) {
2828
.tbbMallocDllInfo <<- loadTbbLibrary("tbbmalloc")
2929

3030
# load RcppParallel library if available
31-
# (work around https://github.com/r-lib/devtools/issues/2343)
32-
if (!file.exists(file.path(libname, pkgname, "lib")))
33-
return()
34-
3531
.dllInfo <<- library.dynam("RcppParallel", pkgname, libname)
3632

3733
}
@@ -49,5 +45,5 @@ loadTbbLibrary <- function(name) {
4945
# unload tbb if we loaded it
5046
if (!is.null(.tbbDllInfo))
5147
dyn.unload(.tbbDllInfo[["path"]])
52-
48+
5349
}

src/install.libs.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# copy tbb
1313
# TODO: use 'dest' library directory once rstan is updated
14-
tbbDest <- file.path(R_PACKAGE_DIR, "lib", R_ARCH)
14+
tbbDest <- paste0("../inst/lib", R_ARCH)
1515
dir.create(tbbDest, recursive = TRUE, showWarnings = FALSE)
1616

1717
# check for bundled vs. system tbb

0 commit comments

Comments
 (0)