fixes

Author: Alexandr-Solovev

dev/bazel/deps/tbb.bzl

@@ -27,12 +27,4 @@ tbb_repo = repos.prebuilt_libs_repo_rule(
         "lib/libtbbmalloc.so.2",
     ],
     build_template = "@onedal//dev/bazel/deps:tbb.tpl.BUILD",
-    # Remove this once support for TBB 2021.11 and older versions is discontinued
-    local_mapping = {
-    # Required directory layout and layout in the downloaded
-    # archives may be different. Mapping helps to setup relations
-    # between required layout (LHS) and downloaded (RHS).
-    # In this case, files from `lib/*` will be copied to `lib/intel64/*`.
-    "lib/": "lib/intel64/gcc4.8/",
-    },
 )

dev/download_tbb.sh

@@ -75,6 +75,11 @@ if [ ! -d "${DST}/${OS}/bin" ]; then
   else
     echo tar -xvf "${DST}/${TBB_PACKAGE}" -C "${DST}"
     tar -C "${DST}/${OS}" --strip-components=1 -xvf "${DST}/${TBB_PACKAGE}"
+    # Flatten old TBB layout (lib/intel64/gcc4.8/) to new layout (lib/)
+    if [ -d "${DST}/${OS}/lib/intel64/gcc4.8" ]; then
+      mv "${DST}/${OS}/lib/intel64/gcc4.8"/* "${DST}/${OS}/lib/"
+      rm -rf "${DST}/${OS}/lib/intel64"
+    fi
   fi
   ls -al "${DST}/${OS}/"
   echo "Downloaded and unpacked oneTBB to ${DST}/${OS}"