diff --git a/internal/rosa/llvm.go b/internal/rosa/llvm.go
index 9568b5aa..6a68e12e 100644
--- a/internal/rosa/llvm.go
+++ b/internal/rosa/llvm.go
@@ -83,9 +83,11 @@ func init() {
 			{"LIBCXX_ENABLE_STATIC_ABI_LIBRARY", "OFF"},
 			{"LIBCXX_HAS_MUSL_LIBC", "ON"},
 			{"LIBCXX_HARDENING_MODE", "fast"},
+			{"LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY", "ON"},
 			{"LIBCXXABI_USE_LLVM_UNWINDER", "ON"},
-			{"LIBCXXABI_ENABLE_STATIC_UNWINDER", "OFF"},
+			{"LIBCXXABI_ENABLE_STATIC_UNWINDER", "ON"},
 			{"LIBCXXABI_USE_COMPILER_RT", "ON"},
+			{"LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY", "ON"},
 			{"LLVM_INSTALL_BINUTILS_SYMLINKS", "ON"},
 			{"LLVM_INSTALL_UTILS", "ON"},
 			{"LLVM_BUILD_LLVM_DYLIB", "ON"},
@@ -138,6 +140,9 @@ func init() {
 				"CodeGen/PowerPC/ppc-tmmintrin.c",
 				"CodeGen/PowerPC/ppc-smmintrin.c",
 				"CodeGenCUDA/amdgpu-alias-undef-symbols.cu",
+				// clang: deadlocks with LIBCXXABI_ENABLE_STATIC_UNWINDER
+				"global-hex-value-regex",
+				"check-globals",
 				// cxx: fails on musl
 				"close.dont-get-rid-of-buffer",
 				"re/re.traits",
@@ -196,6 +201,7 @@ ln -s ld.lld /work/system/bin/ld
 ln -s clang /work/system/bin/cc
 ln -s clang /work/system/bin/cpp
 ln -s clang++ /work/system/bin/c++
+echo '-static-libstdc++' > /work/system/bin/clang++.cfg
 `,
 
 			// LLVM_LINK_LLVM_DYLIB causes llvm test suite to leak system