diff --git a/third_party/clang_llvm_12_00_x86_64_linux_gnu_ubuntu_16_04.BUILD b/third_party/clang_llvm_12_00_x86_64_linux_gnu_ubuntu_16_04.BUILD
index 9ef72ae..66b17db 100644
--- a/third_party/clang_llvm_12_00_x86_64_linux_gnu_ubuntu_16_04.BUILD
+++ b/third_party/clang_llvm_12_00_x86_64_linux_gnu_ubuntu_16_04.BUILD
@@ -22,6 +22,7 @@ filegroup(
     srcs = [
         "bin/clang",
         "bin/clang++",
+        "bin/clang-12",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/third_party/debian_stretch_amd64_sysroot.BUILD b/third_party/debian_stretch_amd64_sysroot.BUILD
index 91220cf..92df07a 100644
--- a/third_party/debian_stretch_amd64_sysroot.BUILD
+++ b/third_party/debian_stretch_amd64_sysroot.BUILD
@@ -57,7 +57,10 @@ cc_toolchain_import(
 
 cc_toolchain_import(
     name = "mvec",
-    additional_libs = ["usr/lib/x86_64-linux-gnu/libmvec_nonshared.a"],
+    additional_libs = [
+        "usr/lib/x86_64-linux-gnu/libmvec_nonshared.a",
+        "lib/x86_64-linux-gnu/libmvec.so.1",
+    ],
     shared_library = "usr/lib/x86_64-linux-gnu/libmvec.so",
     static_library = "usr/lib/x86_64-linux-gnu/libmvec.a",
     target_compatible_with = select({
@@ -68,6 +71,7 @@ cc_toolchain_import(
 
 cc_toolchain_import(
     name = "dynamic_linker",
+    additional_libs = ["lib/x86_64-linux-gnu/ld-linux-x86-64.so.2"],
     shared_library = "usr/lib/x86_64-linux-gnu/libdl.so",
     static_library = "usr/lib/x86_64-linux-gnu/libdl.a",
     target_compatible_with = select({
@@ -78,6 +82,9 @@ cc_toolchain_import(
 
 cc_toolchain_import(
     name = "math",
+    additional_libs = [
+        "lib/x86_64-linux-gnu/libm.so.6",
+    ],
     shared_library = "usr/lib/x86_64-linux-gnu/libm.so",
     static_library = "usr/lib/x86_64-linux-gnu/libm.a",
     target_compatible_with = select({
@@ -88,7 +95,10 @@ cc_toolchain_import(
 
 cc_toolchain_import(
     name = "pthread",
-    additional_libs = ["usr/lib/x86_64-linux-gnu/libpthread_nonshared.a"],
+    additional_libs = [
+        "usr/lib/x86_64-linux-gnu/libpthread_nonshared.a",
+        "lib/x86_64-linux-gnu/libpthread.so.0",
+    ],
     shared_library = "usr/lib/x86_64-linux-gnu/libpthread.so",
     static_library = "usr/lib/x86_64-linux-gnu/libpthread.a",
     target_compatible_with = select({
@@ -104,6 +114,7 @@ cc_toolchain_import(
         "lib/x86_64-linux-gnu/librt.so.1",
         "lib/x86_64-linux-gnu/librt-2.24.so",
     ],
+    shared_library = "usr/lib/x86_64-linux-gnu/librt.so",
     static_library = "usr/lib/x86_64-linux-gnu/librt.a",
     target_compatible_with = select({
         "@platforms//os:linux": ["@platforms//cpu:x86_64"],
@@ -114,6 +125,10 @@ cc_toolchain_import(
 cc_toolchain_import(
     name = "glibc",
     hdrs = glob([inc + "/**/*.h" for inc in INCLUDES] + [inc + "/*.h" for inc in INCLUDES]),
+    additional_libs = [
+        "lib/x86_64-linux-gnu/libc.so.6",
+        "usr/lib/x86_64-linux-gnu/libc_nonshared.a",
+    ],
     includes = INCLUDES,
     shared_library = "usr/lib/x86_64-linux-gnu/libc.so",
     static_library = "usr/lib/x86_64-linux-gnu/libc.a",