maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

This reverts commit cbaa74a098.
The Py3 change got (mostly, except compiler-rt) reverted again.
This commit is contained in:
Nico Weber 2020-04-28 20:47:26 -04:00
parent c98a7e9bcc
commit 854a7db46c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
View File

@ -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) {

2
llvm/utils/gn/secondary/clang/test/BUILD.gn
View File

@ -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=",
]

2
llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
View File

@ -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",
"Python3_EXECUTABLE=$python_path",
"Python3=$python_path",
"COMPILER_RT_DEBUG_PYBOOL=False",
"COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False",
"COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR=" +

2
llvm/utils/gn/secondary/lld/test/BUILD.gn
View File

@ -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"),
"Python3_EXECUTABLE=$python_path",
"PYTHON_EXECUTABLE=$python_path",
"TARGET_TRIPLE=$llvm_target_triple",
]
values += invoker.extra_values

2
llvm/utils/gn/secondary/llvm/test/BUILD.gn
View File

@ -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",