diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-19 13:24:29 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-19 13:24:29 +0000 |
commit | 8be5c0550e5a4ba0aec8e5e6338be8c6e2316140 (patch) | |
tree | 38c85b35b9ca085528f5b112b0e668eaaedabfde /clang/lib/Driver/Driver.cpp | |
parent | 49b4314cfd69d34572671158c0bd82f86061af32 (diff) | |
download | bcm5719-llvm-8be5c0550e5a4ba0aec8e5e6338be8c6e2316140.tar.gz bcm5719-llvm-8be5c0550e5a4ba0aec8e5e6338be8c6e2316140.zip |
Use llvm::sys::fs::can_execute.
llvm-svn: 184297
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
-rw-r--r-- | clang/lib/Driver/Driver.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 6eeb737ebcb..f32a375ae52 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1579,13 +1579,16 @@ std::string Driver::GetProgramPath(const char *Name, if (!llvm::sys::fs::is_directory(*it, IsDirectory) && IsDirectory) { llvm::sys::Path P(*it); P.appendComponent(TargetSpecificExecutable); - if (P.canExecute()) return P.str(); + if (llvm::sys::fs::can_execute(P.str())) + return P.str(); P.eraseComponent(); P.appendComponent(Name); - if (P.canExecute()) return P.str(); + if (llvm::sys::fs::can_execute(P.str())) + return P.str(); } else { llvm::sys::Path P(*it + Name); - if (P.canExecute()) return P.str(); + if (llvm::sys::fs::can_execute(P.str())) + return P.str(); } } @@ -1594,10 +1597,12 @@ std::string Driver::GetProgramPath(const char *Name, it = List.begin(), ie = List.end(); it != ie; ++it) { llvm::sys::Path P(*it); P.appendComponent(TargetSpecificExecutable); - if (P.canExecute()) return P.str(); + if (llvm::sys::fs::can_execute(P.str())) + return P.str(); P.eraseComponent(); P.appendComponent(Name); - if (P.canExecute()) return P.str(); + if (llvm::sys::fs::can_execute(P.str())) + return P.str(); } // If all else failed, search the path. |