[llvm] 7585ac7 - Reland "[gn build] (manually) merge c4c3883"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-04-28T21:43:58-04:00
New Revision: 7585ac79dd8a2d021f816dfc9cf32d01b6054d27

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

LOG: Reland "[gn build] (manually) merge c4c3883"

The Python3 change relanded yet again, so merge it yet again.

This reverts commit f0019cdc47f59e94b9bc3291b83a9b4cec1bf62b.
This reverts commit 854a7db46c0a9750d9d9f932d5d49c3d64a85153.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
    llvm/utils/gn/secondary/clang/test/BUILD.gn
    llvm/utils/gn/secondary/lld/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 97715cf8d9c9..832028dce654 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"),
-    "PYTHON_EXECUTABLE=$python_path",
+    "Python3_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 f215c35d6aed..12648f846506 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=",
-    "PYTHON_EXECUTABLE=$python_path",
+    "Python3_EXECUTABLE=$python_path",
     "USE_Z3_SOLVER=",
   ]
 

diff  --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index b0ccb7ea0032..71d20751c5d7 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -23,7 +23,7 @@ template("write_lit_cfg") {
       "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"),
-      "PYTHON_EXECUTABLE=$python_path",
+      "Python3_EXECUTABLE=$python_path",
       "TARGET_TRIPLE=$llvm_target_triple",
     ]
     values += invoker.extra_values

diff  --git a/llvm/utils/gn/secondary/llvm/test/BUILD.gn b/llvm/utils/gn/secondary/llvm/test/BUILD.gn
index 427b2c067884..27c96d29f9ef 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=",
-    "PYTHON_EXECUTABLE=$python_path",
+    "Python3_EXECUTABLE=$python_path",
     "TARGETS_TO_BUILD=$llvm_targets_to_build_string",
     "TARGET_TRIPLE=$llvm_target_triple",