diff --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 03f7fe7e8f7891..c4dda49df40bc8 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -51,8 +51,9 @@ write_cmake_config("lit_common_configured") {
     "COMPILER_RT_ASAN_SHADOW_SCALE=",
     "COMPILER_RT_MEMPROF_SHADOW_SCALE=",
     "COMPILER_RT_TEST_STANDALONE_BUILD_LIBS_PYBOOL=False",
-    "COMPILER_RT_TEST_USE_LLD_PYBOOL=0",  # FIXME: base off use_lld?
+    "COMPILER_RT_TEST_USE_LLD_PYBOOL=False",  # FIXME: base off use_lld?
     "SANITIZER_CAN_USE_CXXABI_PYBOOL=True",
+    "SANITIZER_USE_STATIC_CXX_ABI_PYBOOL=False",
     "COMPILER_RT_HAS_LLD_PYBOOL=True",
     "COMPILER_RT_HAS_GWP_ASAN_PYBOOL=False",
     "HAVE_RPC_XDR_H=0",