Merge pull request #1108 from jeroen/develop

Fix LdFlags for new RcppParallel
stan-dev · Jan 11, 2024 · 7f91960 · 7f91960
2 parents cc2598a + e338cee
commit 7f91960
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/StanHeaders/R/Flags.R b/StanHeaders/R/Flags.R
@@ -17,8 +17,9 @@ CxxFlags <- function(as_character = FALSE) {
 }
 
 LdFlags <- function(as_character = FALSE) {
-  if (dir.exists(Sys.getenv("TBB_LIB"))) {
-    TBB_LIB <- normalizePath(Sys.getenv("TBB_LIB"))
+  TBB_LIB <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB"))
+  if (dir.exists(TBB_LIB)) {
+    TBB_LIB <- normalizePath(TBB_LIB)
   } else {
     TBB_LIB <- system.file("lib", .Platform$r_arch, package = "RcppParallel", mustWork = TRUE)
   }