From 4b3f0331295a602124bd0932411a2ca6dc460132 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Wed, 10 Jan 2024 19:36:07 +0100 Subject: [PATCH 1/2] Infer proper arch on MacOS for cross compiling --- src/Makevars.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makevars.in b/src/Makevars.in index 75670079..83e78fb3 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -40,6 +40,7 @@ else ifeq ($(UNAME), Darwin) USE_TBB=Mac + MAKE_ARGS += arch=$(shell uname -m) endif ifeq ($(UNAME), Linux) From 3cba1e2f10ea12dd016c872d622f41f8ab1b8976 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Wed, 10 Jan 2024 22:34:12 +0100 Subject: [PATCH 2/2] Support setting link lib only --- R/tbb.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/tbb.R b/R/tbb.R index 27cf3bba..00fccd3b 100644 --- a/R/tbb.R +++ b/R/tbb.R @@ -75,7 +75,7 @@ tbbCxxFlags <- function() { tbbLdFlags <- function() { # shortcut if TBB_LIB defined - tbbLib <- Sys.getenv("TBB_LIB", unset = TBB_LIB) + tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB)) if (nzchar(tbbLib)) { fmt <- "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc" return(sprintf(fmt, asBuildPath(tbbLib)))