Revert "[gn build] (manually) merge cd84bfb"

nico · nico · commit cbb61831f53f · 2020-04-27T23:31:46.000-04:00
This reverts commit 825f583. This reverts commit 45417ec. cd84bfb was reverted in be884b7
diff --git 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
@@ -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
@@ -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",
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ write_lit_config("lit_site_cfg") {`
`34`	`34`	`"CLANG_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),`
`35`	`35`	`"LLVM_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.`
`36`	`36`	`"LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),`
`37`		`- "Python3_EXECUTABLE=$python_path",`
	`37`	`+ "PYTHON_EXECUTABLE=$python_path",`
`38`	`38`	`]`
`39`	`39`
`40`	`40`	`if (clang_enable_static_analyzer) {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ write_lit_config("lit_site_cfg") {`
`61`	`61`	`"LLVM_HOST_TRIPLE=$llvm_current_triple",`
`62`	`62`	`"LLVM_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.`
`63`	`63`	`"LLVM_USE_SANITIZER=",`
`64`		`- "Python3_EXECUTABLE=$python_path",`
	`64`	`+ "PYTHON_EXECUTABLE=$python_path",`
`65`	`65`	`"USE_Z3_SOLVER=",`
`66`	`66`	`]`
`67`	`67`