Add stdver back in.

Author: jolars

src/Makevars

@@ -74,11 +74,11 @@ tbb:
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cd tbb/src; \
 	if [ -n "$(shell echo $(CC) | grep clang)" ]; then \
-	   $(MAKE_CMD) cpp0x=1 compiler=clang $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=c++0x compiler=clang $(MAKE_ARGS); \
 	elif [ -n "$(shell echo $(CC) | grep gcc)" ]; then \
-	   $(MAKE_CMD) cpp0x=1 compiler=gcc $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=c++0x compiler=gcc $(MAKE_ARGS); \
 	else \
-	   $(MAKE_CMD) cpp0x=1 $(MAKE_ARGS); \
+	   $(MAKE_CMD) stdver=c++0x $(MAKE_ARGS); \
 	fi; \
 	cd ../..; \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)

src/tbb/build/common_rules.inc

@@ -97,7 +97,7 @@ LINK_FILES+=$(TEST_LIBS)
 %_dll.$(DLL): LINK_FLAGS += $(PIC_KEY) $(DYLIB_KEY)
 %_dll.$(DLL): TEST_LIBS := $(subst %_dll.$(DLL),,$(TEST_LIBS))
 %_dll.$(DLL): %_dll.$(OBJ)
-	$(call make-test-binary,$@,$< $(LINK_FILES))
+	$(call make-test-binary,$@,$< $(subst %_dll.$(DLL),,$(LINK_FILES)))
 .PRECIOUS: %_dll.$(OBJ) %_dll.$(DLL)
 
 %.$(OBJ): %.c