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

Move the "run" alias from process launch --shell to process launch --shell-expand-args when building on OS X 

The argdumper-based launching is more friendly to System Integrity Protection, and will work on older releases of OS X as well

Leave non-Apple builds alone

llvm-svn: 248338
This commit is contained in:
Enrico Granata 2015-09-22 22:57:12 +00:00
parent 871b2e5e30
commit f515729a07
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -352,11 +352,19 @@ CommandInterpreter::Initialize ()
#if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) #if defined (__arm__) || defined (__arm64__) || defined (__aarch64__)
ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp); ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp);
#else #else
#if defined(__APPLE__)
std::string shell_option;
shell_option.append("--shell-expand-args");
shell_option.append(" true");
shell_option.append(" --");
ProcessAliasOptionsArgs (cmd_obj_sp, shell_option.c_str(), alias_arguments_vector_sp);
#else
std::string shell_option; std::string shell_option;
shell_option.append("--shell="); shell_option.append("--shell=");
shell_option.append(HostInfo::GetDefaultShell().GetPath()); shell_option.append(HostInfo::GetDefaultShell().GetPath());
shell_option.append(" --"); shell_option.append(" --");
ProcessAliasOptionsArgs (cmd_obj_sp, shell_option.c_str(), alias_arguments_vector_sp); ProcessAliasOptionsArgs (cmd_obj_sp, shell_option.c_str(), alias_arguments_vector_sp);
#endif
#endif #endif
AddAlias ("r", cmd_obj_sp); AddAlias ("r", cmd_obj_sp);
AddAlias ("run", cmd_obj_sp); AddAlias ("run", cmd_obj_sp);