Skip to content

Commit

Permalink
Revert "[gn build] (manually) merge cd84bfb"
Browse files Browse the repository at this point in the history
This reverts commit 825f583.
This reverts commit 45417ec.

cd84bfb was reverted in be884b7
  • Loading branch information
nico committed Apr 28, 2020
1 parent 4bb0a1c commit cbb6183
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/clang-tools-extra/test/BUILD.gn
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/clang/test/BUILD.gn
Expand Up @@ -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=",
]

Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/gn/secondary/llvm/test/BUILD.gn
Expand Up @@ -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",

Expand Down

0 comments on commit cbb6183

Please sign in to comment.