Merge pull request #208 from jeroen/master

Two small tweaks for cross compiling
RcppCore · Jan 11, 2024 · 02b86ca · 02b86ca
2 parents d4573c1 + 3cba1e2
commit 02b86ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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)))

diff --git 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)