Use TBB_INC & TBB_LIB and update CXXFLAGS

Use TBB_INC & TBB_LIB environment variables and update CXXFLAGS accordingly.

To use system TBB, both TBB_INC & TBB_LIB environment variables should be defined and the directories of TBB headers and libraries exist.

Signed-off-by: Hamada S. Badr <hamada.s.badr@gmail.com>

Author: hsbadr

R/build.R

@@ -41,24 +41,29 @@ inlineCxxPlugin <- function() {
 }
 
 tbbCxxFlags <- function() {
-   
+
    flags <- c()
-   
+
    # opt-in to TBB on Windows
    if (Sys.info()['sysname'] == "Windows")
       flags <- paste(flags, "-DRCPP_PARALLEL_USE_TBB=1")
-   
+
+   if (dir.exists(Sys.getenv("TBB_INC"))) {
+       TBB_INC <- asBuildPath(Sys.getenv("TBB_INC"))
+       flags <- paste0("-I", shQuote(TBB_INC))
+   }
+
    flags
 }
 
 # Return the linker flags requried for TBB on this platform
 tbbLdFlags <- function() {
-   tbb <- tbbLibPath()
-   if (file.exists(tbb)) {
-      paste("-L", asBuildPath(dirname(tbb)), " -ltbb -ltbbmalloc", sep = "")
    # on Windows and Solaris we need to explicitly link against tbb.dll
-   } else if ((Sys.info()['sysname'] %in% c("Windows", "SunOS")) && !isSparc()) {
+   if ((Sys.info()['sysname'] %in% c("Windows", "SunOS")) && !isSparc()) {
+      tbb <- tbbLibPath()
       paste("-L", asBuildPath(dirname(tbb)), " -ltbb -ltbbmalloc", sep = "")
+   } else if (dir.exists(Sys.getenv("TBB_LIB"))) {
+      paste("-L", asBuildPath(Sys.getenv("TBB_LIB")), " -ltbb -ltbbmalloc", sep = "")
    } else {
       ""
    }
@@ -74,10 +79,9 @@ tbbLibPath <- function(suffix = "") {
       "SunOS" = paste("libtbb", suffix, ".so", sep = "")
    )
 
-   tbb <- Sys.getenv("TBB_LIBRARY_FILE")
-   if (file.exists(tbb)) {
-      libDir <- dirname(tbb)
-      normalizePath(file.path(libDir, paste("libtbb", suffix, ".so", sep = "")))
+   if (dir.exists(Sys.getenv("TBB_LIB"))) {
+      TBB_LIB <- asBuildPath(Sys.getenv("TBB_LIB"))
+      asBuildPath(file.path(TBB_LIB, paste("libtbb", suffix, ".so", sep = "")))
    } else {
       if ((sysname %in% names(tbbSupported)) && !isSparc()) {
          libDir <- "lib/"

src/Makevars.in

@@ -1,9 +1,14 @@
 
-PKG_CPPFLAGS = -I../inst/include
 PKG_CXXFLAGS = @CXX11STD@
 
-ifdef TBB_LIBRARY_FILE
-PKG_LIBS = -ltbb
+ifdef TBB_INC
+PKG_CPPFLAGS = -I../inst/include -I$(TBB_INC)
+else
+PKG_CPPFLAGS = -I../inst/include
+endif
+
+ifdef TBB_LIB
+PKG_LIBS = -L$(TBB_LIB) -ltbb
 endif
 
 ifeq ($(OS), Windows_NT)
@@ -90,8 +95,8 @@ endif
 all: tbb $(SHLIB)
 
 tbb:
-ifdef TBB_LIBRARY_FILE
-	echo "Using system (Intel/OneAPI) TBB library: $(TBB_LIBRARY_FILE)"; \
+ifdef TBB_LIB
+	echo "Using system (Intel/OneAPI) TBB library..."; \
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	rm -rf ../inst/include/serial/ ../inst/include/tbb/; \
 	rm -rf ../inst/include/tbb_local/
@@ -113,7 +118,7 @@ else
 endif
 
 clean:
-ifdef TBB_LIBRARY_FILE
+ifdef TBB_LIB
 	echo "Nothing to clean for TBB."
 else
 	(cd tbb/src; make clean)