diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index df0b1e63bd25..1e78436e86f1 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -57,9 +57,10 @@ clang_asan_cflags = (" -fsanitize=address"
                    + " -fno-optimize-sibling-calls"
                    + " -g"
                    + bits_cflag)
-clang_asan_cxxflags = " -ccc-cxx" + clang_asan_cflags
+clang_asan_cxxflags = " --driver-mode=g++" + clang_asan_cflags
 config.substitutions.append( ("%clang ", " " + config.clang + bits_cflag + " "))
-config.substitutions.append( ("%clangxx ", (" " + config.clang + " -ccc-cxx" +
+config.substitutions.append( ("%clangxx ", (" " + config.clang +
+                                            " --driver-mode=g++" +
                                             bits_cflag + " ")) )
 config.substitutions.append( ("%clang_asan ", (" " + config.clang + " " +
                                               clang_asan_cflags + " ")) )
diff --git a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
index dfae8db4c890..d52f64ccf219 100644
--- a/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
+++ b/compiler-rt/lib/lsan/lit_tests/lit.common.cfg
@@ -16,7 +16,7 @@ def get_required_attr(config, attr_name):
 lsan_lit_src_root = get_required_attr(config, 'lsan_lit_src_root')
 config.test_source_root = os.path.join(lsan_lit_src_root, 'TestCases')
 
-clang_cxxflags = ("-ccc-cxx "
+clang_cxxflags = ("--driver-mode=g++ "
                       + "-g "
                       + "-O0 "
                       + "-m64 ")
diff --git a/compiler-rt/lib/msan/lit_tests/lit.cfg b/compiler-rt/lib/msan/lit_tests/lit.cfg
index 0a39626a3c4f..bc19b740c0de 100644
--- a/compiler-rt/lib/msan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/msan/lit_tests/lit.cfg
@@ -54,7 +54,7 @@ clang_msan_cflags = ["-fsanitize=memory",
                      "-fno-omit-frame-pointer",
                      "-fno-optimize-sibling-calls",
                      "-g"]
-clang_msan_cxxflags = ["-ccc-cxx "] + clang_msan_cflags
+clang_msan_cxxflags = ["--driver-mode=g++ "] + clang_msan_cflags
 config.substitutions.append( ("%clang_msan ",
                               " ".join([config.clang] + clang_msan_cflags) + 
                               " ") )
diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/lib/tsan/lit_tests/lit.cfg
index af78828bd67b..ce6c23a84a82 100644
--- a/compiler-rt/lib/tsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/lit.cfg
@@ -62,7 +62,7 @@ clang_tsan_cflags = ("-fsanitize=thread "
                       + "-Wall "
                       + "-lpthread "
                       + "-ldl ")
-clang_tsan_cxxflags = "-ccc-cxx " + clang_tsan_cflags
+clang_tsan_cxxflags = "--driver-mode=g++ " + clang_tsan_cflags
 config.substitutions.append( ("%clangxx_tsan ", (" " + config.clang + " " +
                                                 clang_tsan_cxxflags + " ")) )
 config.substitutions.append( ("%clang_tsan ", (" " + config.clang + " " +