Skip to content

Commit 60e9bab

Browse files
committed
Is init.c causing osx to fail?
1 parent b4ac8a6 commit 60e9bab

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed

src/Makevars

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ tbb:
7474
mkdir -p ../inst/lib/$(ARCH_DIR); \
7575
cd tbb/src; \
7676
if [ -n "$(shell echo $(CC) | grep clang)" ]; then \
77-
$(MAKE_CMD) cpp0x=1 compiler=clang $(MAKE_ARGS); \
77+
$(MAKE_CMD) stdver=c++0x compiler=clang $(MAKE_ARGS); \
7878
elif [ -n "$(shell echo $(CC) | grep gcc)" ]; then \
79-
$(MAKE_CMD) cpp0x=1 compiler=gcc $(MAKE_ARGS); \
79+
$(MAKE_CMD) stdver=c++0x compiler=gcc $(MAKE_ARGS); \
8080
else \
81-
$(MAKE_CMD) cpp0x=1 $(MAKE_ARGS); \
81+
$(MAKE_CMD) stdver=c++0x $(MAKE_ARGS); \
8282
fi; \
8383
cd ../..; \
8484
cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)

src/init.c

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)