From f75a03ef22b8c683dcd36fd8e03bcfc0ae790076 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 15 Mar 2021 17:00:09 -0400 Subject: [PATCH] [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. --- utils/gn/secondary/clang/test/BUILD.gn | 1 + utils/gn/secondary/lld/test/BUILD.gn | 5 ++++- utils/gn/secondary/llvm/test/BUILD.gn | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/gn/secondary/clang/test/BUILD.gn b/utils/gn/secondary/clang/test/BUILD.gn index c19432cdb26..36b588dc511 100644 --- a/utils/gn/secondary/clang/test/BUILD.gn +++ b/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/utils/gn/secondary/lld/test/BUILD.gn b/utils/gn/secondary/lld/test/BUILD.gn index dcdab2006dc..007c1f79963 100644 --- a/utils/gn/secondary/lld/test/BUILD.gn +++ b/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/utils/gn/secondary/llvm/test/BUILD.gn b/utils/gn/secondary/llvm/test/BUILD.gn index 6ef8b7c8969..4eb96e37497 100644 --- a/utils/gn/secondary/llvm/test/BUILD.gn +++ b/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",