Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/install.libs.R
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ useBundledTbb <- function() {
full.names = TRUE
)

# clear any artifacts from prior builds, so that we only ship
# the libraries produced by the build above
unlink("tbb/build/lib_release", recursive = TRUE)

dir.create("tbb/build/lib_release", recursive = TRUE, showWarnings = FALSE)
file.copy(tbbFiles, "tbb/build/lib_release", overwrite = TRUE)
unlink("tbb/build-tbb", recursive = TRUE)
Expand Down
7 changes: 5 additions & 2 deletions tools/config/cleanup.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
# Clean up files generated during configuration here.
# Use 'remove_file()' to remove files generated during configuration.

# unlink("src/tbb/build", recursive = TRUE)
# unlink("src/tbb/build-tbb", recursive = TRUE)
# NOTE: stale artifacts in src/tbb/build can otherwise be swept into the
# installed package; the bundled TBB is rebuilt from scratch on each
# install, so nothing is lost by removing these
unlink("src/tbb/build", recursive = TRUE)
unlink("src/tbb/build-tbb", recursive = TRUE)
unlink("inst/lib", recursive = TRUE)
unlink("inst/libs", recursive = TRUE)
unlink("inst/include/index.html", recursive = TRUE)
Expand Down
Loading