From c9864d8a7373dda7592a264786528ac4cff6c097 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sat, 14 Feb 2015 07:11:25 +0000 Subject: [PATCH] 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 --- test/CMakeLists.txt | 3 +++ test/lit.site.cfg.in | 1 + utils/llvm-lit/llvm-lit.in | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f85a1d97e90..27ed3005bca 100644 --- 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 64ad0c39842..7a887b9942f 100644 --- 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 1ee68ab688a..fc962021d73 100755 --- 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