Automerge: [gn] port b42c883

Author: nico

llvm/utils/gn/secondary/clang/test/BUILD.gn

@@ -48,8 +48,7 @@ write_lit_config("lit_site_cfg") {
     "LLVM_LINK_LLVM_DYLIB=0",
     "CLANG_LINK_CLANG_DYLIB=0",
     "LLVM_WITH_Z3=0",
-    "TEST_WITH_Z3_DEVEL=0",
-    "Z3_INCLUDE_DIR=",
+    "TEST_WITH_Z3_MOCK=0",
     "CLANG_BUILD_EXAMPLES=0",
     "CLANG_BUILT_STANDALONE=0",
     "CLANG_DEFAULT_CXX_STDLIB=",  # Empty string means "default value" here.
@@ -59,15 +58,6 @@ write_lit_config("lit_site_cfg") {
     "CLANG_PLUGIN_SUPPORT=0",  # FIXME: Analysis/plugins need global -fPIC
     "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin", dir),
     "CLANG_VENDOR_UTI=org.llvm.clang",
-
-    # This is only used if LLVM_USE_SANITIZER includes lsan and the host
-    # OS is macOS. Since the GN build currently never uses LLVM_USE_SANITIZER,
-    # this is never read.  If it's ever needed,
-    # utils/gn/build/toolchain/BUILD.gn should get the compiler from a variable
-    # that's also read here -- but that should happen after multi-toolchain
-    # builds exist, to make sure it's a toolchain var.
-    "CMAKE_CXX_COMPILER=c++",
-    "CMAKE_C_COMPILER=cc",
     "ENABLE_BACKTRACES=1",
     "ENABLE_SHARED=0",
     "LLVM_EXPERIMENTAL_KEY_INSTRUCTIONS=0",