Skip to content

Commit 6f9f246

Browse files
committed
Revert "don't forward ia32 to TBB under solaris sparc"
This reverts commit a0cf438.
1 parent 99eea40 commit 6f9f246

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/Makevars

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ 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
5150
ifeq ($(USE_TBB), SunOS)
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
51+
R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
52+
ifeq ($(R_32BIT), TRUE)
53+
MAKE_ARGS += arch=ia32
5854
endif
5955
endif
6056

0 commit comments

Comments
 (0)