Skip to content

Commit

Permalink
[clang] [clang-offload-bundler] Fix finding installed llvm-objcopy
Browse files Browse the repository at this point in the history
Allow finding installed llvm-objcopy in PATH if it's not present
in the directory containing clang-offload-bundler.  This is the case
if clang is being built stand-alone, and llvm-objcopy is already
installed while the c-o-b tool is still present in build directory.

This is consistent with how e.g. llvm-symbolizer is found in LLVM.
However, most of similar searches in LLVM and Clang are performed
without special-casing the program directory.

Fixes r369955.

Differential Revision: https://reviews.llvm.org/D68931

llvm-svn: 374754
  • Loading branch information
mgorny committed Oct 14, 2019
1 parent eecef1e commit f89e758
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions clang/tools/clang-offload-bundler/ClangOffloadBundler.cpp
Expand Up @@ -468,6 +468,8 @@ class ObjectFileHandler final : public FileHandler {
// Find llvm-objcopy in order to create the bundle binary.
ErrorOr<std::string> Objcopy = sys::findProgramByName(
"llvm-objcopy", sys::path::parent_path(BundlerExecutable));
if (!Objcopy)
Objcopy = sys::findProgramByName("llvm-objcopy");
if (!Objcopy) {
errs() << "error: unable to find 'llvm-objcopy' in path.\n";
return true;
Expand Down

0 comments on commit f89e758

Please sign in to comment.