From 51a257637e60e4789165a357c8544e8fc4973e68 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Sun, 20 Oct 2013 21:45:47 +0200
Subject: [PATCH] LLDB: Set environment for debugged process
Task-number: QTCREATORBUG-10030
Change-Id: Ib487cee704ea30f52c52f6f025823637fa4199eb
Reviewed-by: hjk <hjk121@nokiamail.com>
---
share/qtcreator/debugger/lldbbridge.py | 2 ++
src/plugins/debugger/lldb/lldbengine.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 10fd0c0edb6..bbf0727838a 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -692,6 +692,8 @@ class Dumper(DumperBase):
else:
launchInfo = lldb.SBLaunchInfo(self.processArgs_.split(' '))
launchInfo.SetWorkingDirectory(os.getcwd())
+ environmentList = [key + "=" + value for key,value in os.environ.items()]
+ launchInfo.SetEnvironmentEntries(environmentList, False)
self.process = self.target.Launch(launchInfo, error)
self.report('pid="%s"' % self.process.GetProcessID())
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index cbda4c3accb..9526e5e6081 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -151,6 +151,8 @@ void LldbEngine::setupEngine()
args.append(Core::ICore::resourcePath() + _("/debugger/lldbbridge.py"));
args.append(m_lldbCmd);
showMessage(_("STARTING LLDB ") + args.join(QLatin1String(" ")));
+ m_lldbProc.setEnvironment(startParameters().environment.toStringList());
+
m_lldbProc.start(_("python"), args);
if (!m_lldbProc.waitForStarted()) {
--
GitLab