From e1c20ea1e9416faf91564a963c7f70d1e3588d2e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 22 Feb 2011 12:54:48 +0100
Subject: [PATCH] Maemo: Tell compiler which paths to mangle.
Can be overridden by setting the environment variable maually.
---
.../qt4projectmanager/qt-maemo/maemotoolchain.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
index f671e710e1d..34cb3ac2fd4 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp
@@ -102,6 +102,15 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const
.arg(maddeRoot)));
env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot)));
+
+ const QString manglePathsKey = QLatin1String("GCCWRAPPER_PATHMANGLE");
+ if (!env.hasKey(manglePathsKey)) {
+ const QStringList pathsToMangle = QStringList() << QLatin1String("/lib")
+ << QLatin1String("/opt") << QLatin1String("/usr");
+ env.set(manglePathsKey, QString());
+ foreach (const QString &path, pathsToMangle)
+ env.appendOrSet(manglePathsKey, path, QLatin1String(":"));
+ }
}
QString MaemoToolChain::sysroot() const
--
GitLab