maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb] Avoid using any shell when calling xcrun. 

When we run `xcrun` we don't have any user input in our command so relying on
the user's default shell doesn't make a lot of sense. If the user has set the
system shell to a something that isn't supported yet (dash, ash) then we would
run into the problem that we don't know how to escape our command string.

This patch just avoids using any shell at all as xcrun is always at the same
path.

Reviewed By: aprantl, JDevlieghere, kastiglione

Differential Revision: https://reviews.llvm.org/D104653
This commit is contained in:
Raphael Isemann 2021-06-28 18:58:42 +02:00
parent 2ab27758d5
commit 355541a1b7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm
View File

@ -383,17 +383,22 @@ static std::string GetXcodeSDK(XcodeSDK sdk) {
auto xcrun = [](const std::string &sdk,
llvm::StringRef developer_dir = "") -> std::string {
std::string xcrun_cmd = "xcrun --show-sdk-path --sdk " + sdk;
if (!developer_dir.empty())
xcrun_cmd = "/usr/bin/env DEVELOPER_DIR=\"" + developer_dir.str() +
"\" " + xcrun_cmd;
Args args;
if (!developer_dir.empty()) {
args.AppendArgument("/usr/bin/env");
args.AppendArgument("DEVELOPER_DIR=" + developer_dir.str());
}
args.AppendArgument("/usr/bin/xcrun");
args.AppendArgument("--show-sdk-path");
args.AppendArgument("--sdk");
args.AppendArgument(sdk);
int status = 0;
int signo = 0;
std::string output_str;
lldb_private::Status error =
Host::RunShellCommand(xcrun_cmd, FileSpec(), &status, &signo,
&output_str, std::chrono::seconds(15));
Host::RunShellCommand(args, FileSpec(), &status, &signo, &output_str,
std::chrono::seconds(15));
// Check that xcrun return something useful.
if (status != 0 || output_str.empty())