diff --git a/toolchain/BUILD.tpl b/toolchain/BUILD.tpl
index 58ea42b6..2ac8eb16 100644
--- a/toolchain/BUILD.tpl
+++ b/toolchain/BUILD.tpl
@@ -148,6 +148,7 @@ filegroup(
         [
             "lib/lib*.a",
             "lib/clang/%{llvm_version}/lib/**/*.a",
+            "lib/clang/%{llvm_version}/lib/**/*.dylib",
         ],
         exclude = [
             "lib/libLLVM*.a",
diff --git a/toolchain/cc_toolchain_config.bzl.tpl b/toolchain/cc_toolchain_config.bzl.tpl
index d218f061..a238dd1e 100644
--- a/toolchain/cc_toolchain_config.bzl.tpl
+++ b/toolchain/cc_toolchain_config.bzl.tpl
@@ -259,6 +259,9 @@ def _impl(ctx):
                             "-L%{toolchain_path_prefix}/lib",
                             "-lc++-static",
                             "-lc++abi-static",
+                            "-Bstatic",
+                            "-lunwind",
+                            "-Bdynamic",
                         ],
                     ),
                 ],
@@ -275,6 +278,9 @@ def _impl(ctx):
                         flags = [
                             "-lc++",
                             "-lc++abi",
+                            "-Bstatic",
+                            "-lunwind",
+                            "-Bdynamic",
                         ],
                     ),
                 ],