Merge branch 'master' of github.com:RcppCore/RcppParallel

Author: jjallaire

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RcppParallel
 Type: Package
 Title: Parallel Programming Tools for Rcpp
-Version: 4.3.8
+Version: 4.3.9
 Date: 2015-04-13
 Authors@R: c(
     person("JJ", "Allaire", role = c("aut", "cre"), email = "jj@rstudio.com"),

NEWS

@@ -1,8 +1,12 @@
-RcppParallel 4.3.7
+RcppParallel 4.3.9
 ------------------------------------------------------------------------
 
-* Add tbbmalloc library
 * Add support for TBB on Solaris
+
+RcppParallel 4.3.8
+------------------------------------------------------------------------
+
+* Add tbbmalloc library
 * Fix failure to compile on OS X Snow Leopard R toolchain
 * Correctly pass clang to TBB configure when R is using clang
 

src/Makevars

@@ -47,10 +47,14 @@ ifeq ($(USE_TBB),  Windows)
 
 endif
 
+# For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
 ifeq ($(USE_TBB),  SunOS)
-   R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
-   ifeq ($(R_32BIT), TRUE)
-      MAKE_ARGS += arch=ia32
+   SUNOS_ARCH = $(shell uname -p)
+   ifneq ($(SUNOS_ARCH),  sparc)
+      R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
+      ifeq ($(R_32BIT), TRUE)
+         MAKE_ARGS += arch=ia32
+      endif
    endif
 endif
 
@@ -63,9 +67,9 @@ tbb:
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cd tbb/src; \
 	if [[ "$(CC)" == clang* ]]; then \
-	   make cpp0x=1 compiler=clang $(MAKE_ARGS); \
+	   $(MAKE) cpp0x=1 compiler=clang $(MAKE_ARGS); \
 	else \
-	   make cpp0x=1 $(MAKE_ARGS); \
+	   $(MAKE) cpp0x=1 $(MAKE_ARGS); \
 	fi; \
 	cd ../..; \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)