refine resolution of TBB root

Author: kevinushey

R/build.R

@@ -78,7 +78,7 @@ tbbLdFlags <- function() {
    tbbLib <- Sys.getenv("TBB_LIB", unset = NA)
    if (!is.na(tbbLib)) {
       fmt <- "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
-      return(sprintf(fmt, asBuildPath(tbbLib)))
+      return(sprintf(fmt, shQuote(asBuildPath(tbbLib))))
    }
 
    # on Windows and Solaris, we need to explicitly link
@@ -94,6 +94,12 @@ tbbLdFlags <- function() {
 
 }
 
+tbbRoot <- function() {
+   rArch <- .Platform$r_arch
+   libDir <- paste(c("lib", if (nzchar(rArch)) rArch), collapse = "/")
+   system.file(libDir, package = "RcppParallel")
+}
+
 # Determine the platform-specific path to the TBB library
 tbbLibPath <- function(suffix = "") {
 
@@ -106,36 +112,22 @@ tbbLibPath <- function(suffix = "") {
       "SunOS"   = paste0("libtbb", suffix, ".so"),
       "Linux"   = paste0("libtbb", suffix, c(".so", ".so.2"))
    )
-
-   # shortcut if TBB_LIB is defined
-   tbbLib <- Sys.getenv("TBB_LIB", unset = NA)
-   if (!is.na(tbbLib)) {
-      libPaths <- file.path(tbbLib, tbbLibNames[[sysname]])
-      for (libPath in libPaths)
-         if (file.exists(libPath))
-            return(asBuildPath(libPath))
-   }
 
-   # otherwise, construct library path as appropriate for arch
+   # skip systems that we know not to be compatible
    isCompatible <-
       !is_sparc() &&
       !is.null(tbbLibNames[[sysname]])
 
    if (!isCompatible)
       return(NULL)
 
-   # construct library path
-   arch <- .Platform$r_arch
-   components <- c("lib", if (nzchar(arch)) arch)
-   libDir <- paste(components, collapse = "/")
-   
-   # form path to bundled tbb component
+   # find root for TBB install
+   tbbRoot <- Sys.getenv("TBB_LIB", unset = tbbRoot())
    libNames <- tbbLibNames[[sysname]]
    for (libName in libNames) {
-      tbbName <- file.path(libDir, libName)
-      tbbPath <- system.file(tbbName, package = "RcppParallel")
-      if (file.exists(tbbPath))
-         return(tbbPath)
+      tbbName <- file.path(tbbRoot, libName)
+      if (file.exists(tbbName))
+         return(tbbName)
    }
 
 }

src/Makevars.in

@@ -125,13 +125,7 @@ else
 	rm -Rf ../inst/include/tbb_local/; \
 	cp -R tbb/include/* ../inst/include/; \
 	cd tbb/src; \
-	if [ -n "$(shell echo $(CC) | grep clang)" ]; then \
-	   $(MAKE_CMD) stdver=@STDVER@ compiler=clang $(MAKE_ARGS); \
-	elif [ -n "$(shell echo $(CC) | grep gcc)" ]; then \
-	   $(MAKE_CMD) stdver=@STDVER@ compiler=gcc $(MAKE_ARGS); \
-	else \
-	   $(MAKE_CMD) stdver=@STDVER@ $(MAKE_ARGS); \
-	fi; \
+	$(MAKE_CMD) stdver=@STDVER@ $(MAKE_ARGS); \
 	cd ../..; \
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)