Skip to content

Commit 952a9bc

Browse files
committed
Revert "remove usage of '[[' bashism"
This reverts commit 988229b.
1 parent 988229b commit 952a9bc

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/Makevars

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ ifeq ($(USE_TBB), SunOS)
6262
endif
6363
endif
6464

65-
COMPILER = $(shell basename $(CC))
66-
6765
.PHONY: all tbb
6866

6967
# Order is important in Windows' case. See PKG_LIBS above
@@ -72,9 +70,9 @@ all: tbb $(SHLIB)
7270
tbb:
7371
mkdir -p ../inst/lib/$(ARCH_DIR); \
7472
cd tbb/src; \
75-
if [ "$(COMPILER:0:5)" = "clang" ]; then \
73+
if [[ "$(CC)" == clang* ]]; then \
7674
$(MAKE_CMD) cpp0x=1 compiler=clang $(MAKE_ARGS); \
77-
elif [ "$(COMPILER:0:3)" = "gcc" ]; then \
75+
elif [[ "$(CC)" == *gcc* ]]; then \
7876
$(MAKE_CMD) cpp0x=1 compiler=gcc $(MAKE_ARGS); \
7977
else \
8078
$(MAKE_CMD) cpp0x=1 $(MAKE_ARGS); \

0 commit comments

Comments
 (0)