Skip to content

Commit 7a253c2

Browse files
committed
Revert "[lldb] Resolve executables more aggressively on the host"
This reverts commit c3fe1c4.
1 parent 8a4152b commit 7a253c2

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

lldb/include/lldb/Target/RemoteAwarePlatform.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ class RemoteAwarePlatform : public Platform {
2020
public:
2121
using Platform::Platform;
2222

23-
virtual Status
24-
ResolveExecutable(const ModuleSpec &module_spec,
25-
lldb::ModuleSP &exe_module_sp,
26-
const FileSpecList *module_search_paths_ptr) override;
27-
2823
bool GetModuleSpec(const FileSpec &module_file_spec, const ArchSpec &arch,
2924
ModuleSpec &module_spec) override;
3025

lldb/source/Target/RemoteAwarePlatform.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,6 @@ bool RemoteAwarePlatform::GetModuleSpec(const FileSpec &module_file_spec,
2929
return false;
3030
}
3131

32-
Status RemoteAwarePlatform::ResolveExecutable(
33-
const ModuleSpec &module_spec, lldb::ModuleSP &exe_module_sp,
34-
const FileSpecList *module_search_paths_ptr) {
35-
ModuleSpec resolved_module_spec(module_spec);
36-
37-
// The host platform can resolve the path more aggressively.
38-
if (IsHost()) {
39-
FileSpec &resolved_file_spec = resolved_module_spec.GetFileSpec();
40-
41-
if (!FileSystem::Instance().Exists(resolved_file_spec)) {
42-
resolved_module_spec.GetFileSpec().SetFile(resolved_file_spec.GetPath(),
43-
FileSpec::Style::native);
44-
FileSystem::Instance().Resolve(resolved_file_spec);
45-
}
46-
47-
if (!FileSystem::Instance().Exists(resolved_file_spec))
48-
FileSystem::Instance().ResolveExecutableLocation(resolved_file_spec);
49-
}
50-
51-
return Platform::ResolveExecutable(resolved_module_spec, exe_module_sp,
52-
module_search_paths_ptr);
53-
}
54-
5532
Status RemoteAwarePlatform::RunShellCommand(
5633
llvm::StringRef command, const FileSpec &working_dir, int *status_ptr,
5734
int *signo_ptr, std::string *command_output,

0 commit comments

Comments
 (0)