From cbaa74a0981833537e88a8eeac9c9df0f528833c Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 28 Apr 2020 10:20:30 -0700 Subject: [PATCH] [gn build] (manually) merge c4c3883 PYTHON_EXECUTABLE changed to Python3_EXECUTABLE in the lit test suite. Committing without review, since the gn build is currently broken. Going forward, more gn build changes may be necessary to get gn to find Python 3 instead of Python 2. --- llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn | 2 +- llvm/utils/gn/secondary/clang/test/BUILD.gn | 2 +- llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn | 2 +- llvm/utils/gn/secondary/lld/test/BUILD.gn | 2 +- llvm/utils/gn/secondary/llvm/test/BUILD.gn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 97715cf..832028d 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 f215c35..12648f8 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/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn index c033991..ca24b4b 100644 --- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn +++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn @@ -40,7 +40,7 @@ write_cmake_config("lit_common_configured") { "COMPILER_RT_RESOLVED_TEST_COMPILER=" + rebase_path("$root_build_dir/bin/clang"), "COMPILER_RT_TEST_COMPILER_ID=Clang", - "PYTHON_EXECUTABLE=$python_path", + "Python3_EXECUTABLE=$python_path", "COMPILER_RT_DEBUG_PYBOOL=False", "COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False", "COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR=" + diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn index b0ccb7e..71d2075 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 427b2c0..27c96d2 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", -- 2.7.4