From 6adb6e07ce1f7c30ac2ff064a375fb96806f16fa Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Tue, 28 Jul 2009 22:08:15 +0000 Subject: [PATCH] Fix a fixme; don't take binaries from the working directory. This fixes clang on non-darwin platforms if a file called 'ld' or 'as' is in the working directory. Based on patch by Pawel Worach! llvm-svn: 77379 --- llvm/lib/System/Unix/Program.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/System/Unix/Program.inc b/llvm/lib/System/Unix/Program.inc index d4e88fd..7e82ef3 100644 --- a/llvm/lib/System/Unix/Program.inc +++ b/llvm/lib/System/Unix/Program.inc @@ -45,9 +45,9 @@ Program::FindProgramByName(const std::string& progName) { Path temp; if (!temp.set(progName)) // invalid name return Path(); - // FIXME: have to check for absolute filename - we cannot assume anything - // about "." being in $PATH - if (temp.canExecute()) // already executable as is + // Use the given path verbatim if it contains any slashes; this matches + // the behavior of sh(1) and friends. + if (progName.find('/') != std::string::npos && temp.canExecute()) return temp; // At this point, the file name is valid and its not executable -- 2.7.4