[Lldb-commits] [lldb] r248338 - Move the "run" alias from process launch --shell to process launch --shell-expand-args when building on OS X

[Enrico Granata via lldb-commits]

Author: enrico
Date: Tue Sep 22 17:57:12 2015
New Revision: 248338

URL: http://llvm.org/viewvc/llvm-project?rev=248338&view=rev
Log:
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


Modified:
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp

Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=248338&r1=248337&r2=248338&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original)
+++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Tue Sep 22 17:57:12 2015
@@ -352,11 +352,19 @@ CommandInterpreter::Initialize ()
 #if defined (__arm__) || defined (__arm64__) || defined (__aarch64__)
         ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp);
 #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;
         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
 #endif
         AddAlias ("r", cmd_obj_sp);
         AddAlias ("run", cmd_obj_sp);