Skip to content

Commit 2f71e52

Browse files
committed
ensure symlinks used when TBB_ROOT set
1 parent 28cfa33 commit 2f71e52

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

22
## RcppParallel 5.1.5 (UNRELEASED)
33

4+
* Fixed an issue where setting `TBB_ROOT` (or `TBB_INC` / `TBB_LIB`) would
5+
copy rather than symlink the associated libraries. (#161)
6+
47
## RcppParallel 5.1.4
58

6-
- Fixed an issue causing client packages of RcppParallel to fail to compile
9+
* Fixed an issue causing client packages of RcppParallel to fail to compile
710
on Solaris.
811

912
## RcppParallel 5.1.3

R/RcppParallel-package.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#'
1515
#' For additional documentation, see the package website at:
1616
#'
17-
#' <https://rcppcore.github.io/RcppParallel>
17+
#' <https://rcppcore.github.io/RcppParallel/>
1818
#'
1919
#'
2020
#' @name RcppParallel-package

src/install.libs.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
dir.create(libsDest, recursive = TRUE, showWarnings = FALSE)
1818
file.copy(files, libsDest, overwrite = TRUE)
1919

20-
# copy tbb
21-
# TODO: use 'dest' library directory once rstan is updated
22-
tbbDest <- paste0("../inst/lib", R_ARCH)
20+
# copy tbb (NOTE: do not use inst/ folder as R will resolve symlinks,
21+
# behavior which we do _not_ want here!)
22+
tbbDest <- file.path(R_PACKAGE_DIR, paste0("lib", R_ARCH))
2323
dir.create(tbbDest, recursive = TRUE, showWarnings = FALSE)
2424

2525
# check for bundled vs. system tbb

0 commit comments

Comments
 (0)