RcppCore
diff --git a/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+17-11Lines changed: 17 additions & 11 deletions b/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+17-11Lines changed: 17 additions & 11 deletions
@@ -2,20 +2,20 @@
 PKG_CXXFLAGS = @CXX11STD@
 
 ifdef TBB_INC
-PKG_CPPFLAGS = -I../inst/include -I$(TBB_INC)
+  PKG_CPPFLAGS = -I../inst/include -I$(TBB_INC)
 else
-PKG_CPPFLAGS = -I../inst/include
+  PKG_CPPFLAGS = -I../inst/include
 endif
 
 ifdef TBB_LIB
-PKG_LIBS = -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
+  PKG_LIBS = -Wl,-L,"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
 endif
 
 ifeq ($(OS), Windows_NT)
 
   USE_TBB=Windows
   TBB_COPY_PATTERN=tbb*.dll
-  
+
   MAKE = make
   MAKEFLAGS = -e -s -j1
   MAKE_CMD =                                  \
@@ -45,7 +45,7 @@ else
     endif
   endif
 
-  MAKEFLAGS = -e -s
+  MAKEFLAGS += -e -s
   MAKE_CMD =                                   \
     CONLY="@CC@ $(PKG_CPPFLAGS) @CPPFLAGS@"    \
     CPLUS="@CXX11@ $(PKG_CPPFLAGS) @CPPFLAGS@" \
@@ -83,18 +83,18 @@ endif
 
 # For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
 ifeq ($(USE_TBB), SunOS)
-   R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
-   ifeq ($(R_32BIT), TRUE)
-      MAKE_ARGS += arch=ia32
-   endif
+  R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
+  ifeq ($(R_32BIT), TRUE)
+    MAKE_ARGS += arch=ia32
+  endif
 endif
 
 # Silence some compilation warnings. This is a dirty trick, but is necessary
 # as TBB uses a number of #pragmas and compiler-specific switches depending
 # on the compiler and machine being compiled for, and it selects and activates
 # those switches only after confirming the specific compiler features it needs.
 ifneq ($(OS), Windows_NT)
-   MAKE_ARGS += >/dev/null 2>&1
+  MAKE_ARGS += >/dev/null 2>&1
 endif
 
 .PHONY: all tbb
@@ -108,13 +108,18 @@ ifdef TBB_LIB
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cp $(TBB_LIB)/libtbb.so ../inst/lib/$(ARCH_DIR)/libtbb.so 2>/dev/null || :; \
 	cp $(TBB_LIB)/libtbbmalloc.so ../inst/lib/$(ARCH_DIR)/libtbbmalloc.so 2>/dev/null || :; \
+	rm -Rf ../inst/include/serial/; \
+	rm -Rf ../inst/include/tbb/; \
+	rm -Rf ../inst/include/tbb_local/; \
 	mkdir -p ../inst/include; \
 	cp -R $(TBB_INC)/serial ../inst/include/ 2>/dev/null || :; \
 	cp -R $(TBB_INC)/oneapi ../inst/include/ 2>/dev/null || :; \
 	cp -R $(TBB_INC)/tbb ../inst/include/ 2>/dev/null || :
 else
 	echo "Using bundled TBB library ..."; \
-	mkdir -p ../inst/lib/$(ARCH_DIR); \
+	rm -Rf ../inst/include/serial/; \
+	rm -Rf ../inst/include/tbb/; \
+	rm -Rf ../inst/include/tbb_local/; \
 	cp -R tbb/include/* ../inst/include/; \
 	cd tbb/src; \
 	if [ -n "$(shell echo $(CC) | grep clang)" ]; then \
@@ -125,6 +130,7 @@ else
 	   $(MAKE_CMD) stdver=@STDVER@ $(MAKE_ARGS); \
 	fi; \
 	cd ../..; \
+	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)
 endif