Skip to content

Commit 06c99a9

Browse files
committed
Don't fail on copy
$(TBB_INC)/serial doesn't exist in the new version of TBB. Signed-off-by: Hamada S. Badr <hamada.s.badr@gmail.com>
1 parent 6ff6eee commit 06c99a9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/Makevars.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ tbb:
9898
ifdef TBB_LIB
9999
echo "Using system (Intel/OneAPI) TBB library..."; \
100100
mkdir -p ../inst/lib/$(ARCH_DIR); \
101-
cp $(TBB_LIB)/libtbb.so ../inst/lib/$(ARCH_DIR)/libtbb.so; \
102-
cp $(TBB_LIB)/libtbbmalloc.so ../inst/lib/$(ARCH_DIR)/libtbbmalloc.so; \
101+
cp $(TBB_LIB)/libtbb.so ../inst/lib/$(ARCH_DIR)/libtbb.so 2>/dev/null || :; \
102+
cp $(TBB_LIB)/libtbbmalloc.so ../inst/lib/$(ARCH_DIR)/libtbbmalloc.so 2>/dev/null || :; \
103103
rm -Rf ../inst/include/serial/ ../inst/include/tbb/; \
104104
rm -Rf ../inst/include/tbb_local/; \
105105
mkdir -p ../inst/include; \
106-
cp -R $(TBB_INC)/serial ../inst/include/; \
107-
cp -R $(TBB_INC)/tbb ../inst/include/
106+
cp -R $(TBB_INC)/serial ../inst/include/ 2>/dev/null || :; \
107+
cp -R $(TBB_INC)/tbb ../inst/include/ 2>/dev/null || :
108108
else
109109
echo "Building TBB library from source code..."; \
110110
mkdir -p ../inst/lib/$(ARCH_DIR); \

0 commit comments

Comments
 (0)