From ae07238c7816a752c1ea6e694338936ac8a61cdf Mon Sep 17 00:00:00 2001
From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: Tue, 6 Nov 2012 08:20:42 +0100
Subject: [PATCH] debugger: gdb: Provide server start script with information

The start script needs information about the environment to be
really useful.
Provide this information by arguments.

Change-Id: I9e08c2a8785758caecbbcbc3ea4f97014ff1e281
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 2083aa64e53..5c64c11daef 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -39,6 +39,7 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/fancymainwindow.h>
+#include <utils/qtcprocess.h>
 #include <projectexplorer/abi.h>
 
 #include <QFileInfo>
@@ -85,7 +86,14 @@ void GdbRemoteServerEngine::setupEngine()
     QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());
     showMessage(_("TRYING TO START ADAPTER"));
     if (!startParameters().serverStartScript.isEmpty()) {
-        m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript);
+
+        // Provide script information about the environment
+        QString arglist;
+        Utils::QtcProcess::addArg(&arglist, startParameters().serverStartScript);
+        Utils::QtcProcess::addArg(&arglist, startParameters().executable);
+        Utils::QtcProcess::addArg(&arglist, startParameters().remoteChannel);
+
+        m_uploadProc.start(_("/bin/sh ") + arglist);
         m_uploadProc.waitForStarted();
     }
     if (startParameters().remoteSetupNeeded)