From 770f3af2323ad1913e0c58ed7d41c449c273a328 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 16 Oct 2014 23:43:20 +0000 Subject: [PATCH] Add our own copy of the find_executable function to cope with installations that do not have the distutils.spawn package. Should hopefully fix the aarch64 buildbot. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219991 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Bindings/Go/lit.local.cfg | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/test/Bindings/Go/lit.local.cfg b/test/Bindings/Go/lit.local.cfg index 5053e2c3952..0d894fded47 100644 --- a/test/Bindings/Go/lit.local.cfg +++ b/test/Bindings/Go/lit.local.cfg @@ -1,11 +1,29 @@ -import distutils.spawn import os import pipes import shlex +import sys if not 'go' in config.root.llvm_bindings: config.unsupported = True +def find_executable(executable, path=None): + if path is None: + path = os.environ['PATH'] + paths = path.split(os.pathsep) + base, ext = os.path.splitext(executable) + + if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'): + executable = executable + '.exe' + + if not os.path.isfile(executable): + for p in paths: + f = os.path.join(p, executable) + if os.path.isfile(f): + return f + return None + else: + return executable + # Resolve certain symlinks in the first word of compiler. # # This is a Go-specific hack. cgo and other Go tools check $CC and $CXX for the @@ -13,7 +31,7 @@ if not 'go' in config.root.llvm_bindings: # $CC is cc and cc is a symlink pointing to clang, as it is on Darwin. def fixup_compiler_path(compiler): args = shlex.split(compiler) - path = distutils.spawn.find_executable(args[0]) + path = find_executable(args[0]) try: if path.endswith('/cc') and os.readlink(path) == 'clang': -- 2.34.1