Skip to content

Commit fa83462

Browse files
committed
Revert "Revert "don't forward ia32 to TBB under solaris sparc""
This reverts commit 6f9f246.
1 parent 9b4477d commit fa83462

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Makevars

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,14 @@ ifeq ($(USE_TBB), Windows)
4747

4848
endif
4949

50+
# For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
5051
ifeq ($(USE_TBB), SunOS)
51-
R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
52-
ifeq ($(R_32BIT), TRUE)
53-
MAKE_ARGS += arch=ia32
52+
SUNOS_ARCH = $(shell uname -p)
53+
ifneq ($(SUNOS_ARCH), sparc)
54+
R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
55+
ifeq ($(R_32BIT), TRUE)
56+
MAKE_ARGS += arch=ia32
57+
endif
5458
endif
5559
endif
5660

0 commit comments

Comments
 (0)