Merge pull request #208 from jeroen/master

Two small tweaks for cross compiling

Author: kevinushey

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

src/Makevars.in

@@ -40,6 +40,7 @@ else
 
 	ifeq ($(UNAME), Darwin)
 		USE_TBB=Mac
+		MAKE_ARGS += arch=$(shell uname -m)
 	endif
 
 	ifeq ($(UNAME), Linux)