diff options
| author | Zachary Turner <zturner@google.com> | 2014-10-20 17:46:43 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2014-10-20 17:46:43 +0000 |
| commit | 10687b0ea5f45dffc800f5d38cb73269aecc9f45 (patch) | |
| tree | 96ea5e429ec5be2355cb38172ffec327e7b86375 /lldb/source/Interpreter/CommandInterpreter.cpp | |
| parent | 7550b114b11bc868c36be493eda43fe821c1edea (diff) | |
| download | bcm5719-llvm-10687b0ea5f45dffc800f5d38cb73269aecc9f45.tar.gz bcm5719-llvm-10687b0ea5f45dffc800f5d38cb73269aecc9f45.zip | |
Remove LLDB_DEFAULT_SHELL #define, and determine this at runtime.
Differential Revision: http://reviews.llvm.org/D5805
Reviewed by: Greg Clayton
llvm-svn: 220217
Diffstat (limited to 'lldb/source/Interpreter/CommandInterpreter.cpp')
| -rw-r--r-- | lldb/source/Interpreter/CommandInterpreter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index b281bf1954c..9097ab007e6 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -339,7 +339,11 @@ CommandInterpreter::Initialize () #if defined (__arm__) || defined (__arm64__) || defined (__aarch64__) ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp); #else - ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=" LLDB_DEFAULT_SHELL " --", alias_arguments_vector_sp); + std::string shell_option; + shell_option.append("--shell="); + shell_option.append(HostInfo::GetDefaultShell().GetPath()); + shell_option.append(" --"); + ProcessAliasOptionsArgs (cmd_obj_sp, shell_option.c_str(), alias_arguments_vector_sp); #endif AddAlias ("r", cmd_obj_sp); AddAlias ("run", cmd_obj_sp); |
