[llvm] 27e0c66 - [gn build] Port 76cad51b

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2022-02-09T15:16:05-08:00
New Revision: 27e0c6670aff7d8308348baf78de8c3eabadac75

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

LOG: [gn build] Port 76cad51b

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
index 76dbb498b611f..fd3e9347bb481 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
@@ -33,7 +33,7 @@ write_lit_config("lit_site_cfg") {
 
   extra_values = [
     "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
-    "LLVM_ENABLE_PLUGINS=0",
+    "CLANG_PLUGIN_SUPPORT=0",
     "LLVM_INSTALL_TOOLCHAIN_ONLY=0",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),

diff  --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn
index 62915ddf7697c..0e464f510b9cc 100644
--- a/llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -47,6 +47,7 @@ write_lit_config("lit_site_cfg") {
     "CLANG_BUILD_EXAMPLES=0",
     "CLANG_DEFAULT_CXX_STDLIB=",  # Empty string means "default value" here.
     "CLANG_DEFAULT_PIE_ON_LINUX=0",
+    "CLANG_PLUGIN_SUPPORT=0",  # FIXME: Analysis/plugins need global -fPIC
     "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin", dir),
     "CLANG_VENDOR_UTI=org.llvm.clang",
 
@@ -108,14 +109,12 @@ write_lit_config("lit_site_cfg") {
     extra_values += [
       # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
       "CMAKE_LIBRARY_OUTPUT_DIRECTORY=" + rebase_path("$root_out_dir/bin", dir),
-      "LLVM_ENABLE_PLUGINS=0",
       "LLVM_LIT_ERRC_MESSAGES=no such file or directory;is a directory;" +
           "invalid argument;permission denied",
     ]
   } else {
     extra_values += [
       "CMAKE_LIBRARY_OUTPUT_DIRECTORY=" + rebase_path("$root_out_dir/lib", dir),
-      "LLVM_ENABLE_PLUGINS=0",  # FIXME: Analysis/plugins need global -fPIC
       "LLVM_LIT_ERRC_MESSAGES=",
     ]
   }