[llvm] 18d38b2 - [gn build] port ed98676fa483

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-02-11T12:41:29-05:00
New Revision: 18d38b240392ed2cbb15ba0b1f09f484033b67b7

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

LOG: [gn build] port ed98676fa483

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index bf2f440e7ca8..dcdab2006dcf 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -14,13 +14,13 @@ template("write_lit_cfg") {
       "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
       "LLD_BINARY_DIR=" +
           rebase_path(get_label_info("//lld", "target_out_dir")),
+      "LLD_LIBS_DIR=",  # FIXME: for shared builds only (?)
+      "LLD_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
       "LLD_SOURCE_DIR=" + rebase_path("//lld"),
       "LLVM_BINARY_DIR=" +
           rebase_path(get_label_info("//llvm", "target_out_dir")),
-      "LLVM_LIBRARY_OUTPUT_INTDIR=",  # FIXME: for shared builds only (?)
       "LLVM_LIBS_DIR=",  # needed only for shared builds
       "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
-      "LLVM_RUNTIME_OUTPUT_INTDIR=" + rebase_path("$root_out_dir/bin"),
       "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
       "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
       "Python3_EXECUTABLE=$python_path",

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