[llvm] efbaf40 - [gn build] kind of merge af2796c76d2f

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-03-15T17:01:00-04:00
New Revision: efbaf4030b50f1350ef19742de6a1d1704a2a6e0

URL: https://github.com/llvm/llvm-project/commit/efbaf4030b50f1350ef19742de6a1d1704a2a6e0
DIFF: https://github.com/llvm/llvm-project/commit/efbaf4030b50f1350ef19742de6a1d1704a2a6e0.diff

LOG: [gn build] kind of merge af2796c76d2f

Good enough for now. If we need more, we'll do the usual
platform-dependent hardcoding that in practice works for everything else
too.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang/test/BUILD.gn
    llvm/utils/gn/secondary/lld/test/BUILD.gn
    llvm/utils/gn/secondary/llvm/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn
index c19432cdb26e..36b588dc511c 100644
--- a/llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -59,6 +59,7 @@ write_lit_config("lit_site_cfg") {
     "ENABLE_BACKTRACES=1",
     "LLVM_ENABLE_NEW_PASS_MANAGER=1",
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
+    "LLVM_LIT_ERRC_MESSAGES=",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_USE_SANITIZER=",
     "Python3_EXECUTABLE=$python_path",

diff  --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index dcdab2006dcf..007c1f799637 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -35,7 +35,10 @@ write_lit_cfg("lit_site_cfg") {
   input = "//lld/test/lit.site.cfg.py.in"
   output = lld_lit_site_cfg_file
 
-  extra_values = [ "LLD_DEFAULT_LD_LLD_IS_MINGW=0" ]  # Must be 0.
+  extra_values = [
+    "LLD_DEFAULT_LD_LLD_IS_MINGW=0", # Must be 0.
+    "LLVM_LIT_ERRC_MESSAGES=",
+  ]
 
   if (llvm_enable_dia_sdk) {
     extra_values += [ "LLVM_ENABLE_DIA_SDK=1" ]

diff  --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 6ef8b7c89699..4eb96e37497a 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -61,6 +61,7 @@ write_lit_config("lit_site_cfg") {
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_LIBS_DIR=" + rebase_path("$root_out_dir/lib", dir),
     "LLVM_LINK_LLVM_DYLIB=0",
+    "LLVM_LIT_ERRC_MESSAGES=",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_NATIVE_ARCH=$native_target",
     "LLVM_USE_INTEL_JITEVENTS=0",