Revert r229224: Make the 'llvm-lit' utility defend against a system where Python3

Apparantly python2.7 also doesn't work. Awesome.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229245 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f85a1d97e90cf6043eb2b3eee81016c062038f8e..27ed3005bcae8cc45a913b842e6aa17d98723367 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Set up some variables specifically used by lit.
+set(LD_EXECUTABLE ${CMAKE_LINKER})
+
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 64ad0c3984208001df130e38c67ea1bf72c979e2..7a887b9942f9f3962907051f5925c4b89cf120ec 100644 (file)
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -12,6 +12,7 @@ config.llvm_shlib_dir = "@SHLIBDIR@"
 config.llvm_shlib_ext = "@SHLIBEXT@"
 config.llvm_exe_ext = "@EXEEXT@"
 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
+config.ld_executable = "@LD_EXECUTABLE@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.ocamlfind_executable = "@OCAMLFIND@"
 config.have_ocamlopt = "@HAVE_OCAMLOPT@"

diff --git a/utils/llvm-lit/llvm-lit.in b/utils/llvm-lit/llvm-lit.in
index 1ee68ab688af73793e27317c5df800707a938499..fc962021d7373599a8fcccd4d869c01f14b8b3c3 100755 (executable)
--- a/utils/llvm-lit/llvm-lit.in
+++ b/utils/llvm-lit/llvm-lit.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 
 import os
 import sys