[llvm] 3d4f116 - [gn build] port 77945a344c3d

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue Oct 4 13:40:48 PDT 2022


Author: Nico Weber
Date: 2022-10-04T16:40:38-04:00
New Revision: 3d4f1169563e3aa9e7fce3c6d8445adf8256a142

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

LOG: [gn build] port 77945a344c3d

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
index 26525af67cf52..8ba0d0f0ded83 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/test/BUILD.gn
@@ -12,6 +12,12 @@ template("write_lit_config") {
       "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
       "LLVM_LIBS_DIR=",  # needed only for shared builds
     ]
+    if (host_os == "win") {
+      # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
+      values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin") ]
+    } else {
+      values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/lib") ]
+    }
     values += invoker.extra_values
   }
 }
@@ -62,12 +68,6 @@ write_lit_config("lit_unit_site_cfg") {
     "CMAKE_CURRENT_SOURCE_DIR=" +
         rebase_path("//clang-tools-extra/clangd/unittests"),
   ]
-  if (host_os == "win") {
-    # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
-    extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin") ]
-  } else {
-    extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/lib") ]
-  }
 }
 
 # This target should contain all dependencies of check-clangd.


        


More information about the llvm-commits mailing list