[llvm] cbb6183 - Revert "[gn build] (manually) merge cd84bfb8142bc7ff3a0"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-04-27T23:31:46-04:00
New Revision: cbb61831f53f34b1c75108fa1b0ed2841512c6e2

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

LOG: Revert "[gn build] (manually) merge cd84bfb8142bc7ff3a0"

This reverts commit 825f583c86ca856e930b434c6e3462398461eb9a.
This reverts commit 45417ecbc1cddb667d044c709ee980c9426d5eb2.

cd84bfb8142bc7ff3a0 was reverted in be884b79352de89

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
    llvm/utils/gn/secondary/clang/test/BUILD.gn
    llvm/utils/gn/secondary/llvm/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 832028dce654..97715cf8d9c9 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
@@ -34,7 +34,7 @@ write_lit_config("lit_site_cfg") {
     "CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
-    "Python3_EXECUTABLE=$python_path",
+    "PYTHON_EXECUTABLE=$python_path",
   ]
 
   if (clang_enable_static_analyzer) {

diff  --git a/llvm/utils/gn/secondary/clang/test/BUILD.gn b/llvm/utils/gn/secondary/clang/test/BUILD.gn
index 12648f846506..f215c35d6aed 100644
--- a/llvm/utils/gn/secondary/clang/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/test/BUILD.gn
@@ -61,7 +61,7 @@ write_lit_config("lit_site_cfg") {
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
     "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
     "LLVM_USE_SANITIZER=",
-    "Python3_EXECUTABLE=$python_path",
+    "PYTHON_EXECUTABLE=$python_path",
     "USE_Z3_SOLVER=",
   ]
 

diff  --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 27c96d29f9ef..427b2c067884 100644
--- a/llvm/utils/gn/secondary/llvm/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
@@ -64,7 +64,7 @@ write_lit_config("lit_site_cfg") {
     "LLVM_NATIVE_ARCH=$native_target",
     "LLVM_USE_INTEL_JITEVENTS=0",
     "LLVM_USE_SANITIZER=",
-    "Python3_EXECUTABLE=$python_path",
+    "PYTHON_EXECUTABLE=$python_path",
     "TARGETS_TO_BUILD=$llvm_targets_to_build_string",
     "TARGET_TRIPLE=$llvm_target_triple",