avoid removing inst/lib on clean

Author: kevinushey

src/Makevars.in

@@ -153,9 +153,9 @@ else
 	@(cd tbb/src && $(MAKE_CMD) @STDVER@ $(MAKE_ARGS) $(MAKE_TARGETS) $(MAKE_LOG))
 endif
 
+# NOTE: we do not want to clean ../inst/lib or ../inst/libs here,
+# as we may be writing to those locations in multiarch builds
 tbb-clean:
-	@rm -rf ../inst/lib
-	@rm -rf ../inst/libs
 	@rm -rf ../inst/include/tbb
 	@rm -rf ../inst/include/oneapi
 	@rm -rf ../inst/include/tbb_local

src/install.libs.R

@@ -13,9 +13,9 @@
       file.copy("symbols.rds", dest, overwrite = TRUE)
 
    # also copy to package 'libs' folder, for devtools
-   dest <- paste0("../libs", R_ARCH)
-   dir.create(dest, recursive = TRUE, showWarnings = FALSE)
-   file.copy(files, dest, overwrite = TRUE)
+   libsDest <- paste0("../libs", R_ARCH)
+   dir.create(libsDest, recursive = TRUE, showWarnings = FALSE)
+   file.copy(files, libsDest, overwrite = TRUE)
 
    # copy tbb
    # TODO: use 'dest' library directory once rstan is updated

tools/config/cleanup.R

@@ -1,4 +1,7 @@
+
 # Clean up files generated during configuration here.
 # Use 'remove_file()' to remove files generated during configuration.
-unlink("src/tbb/build/lib_release", recursive = TRUE)
 
+unlink("src/tbb/build/lib_release", recursive = TRUE)
+unlink("inst/lib",  recursive = TRUE)
+unlink("inst/libs", recursive = TRUE)