Skip to content
Snippets Groups Projects
Commit 87fc59e0 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Re-order some environment settings for extra safety.

Probably not needed here, but can't hurt either.
parent afa13623
No related branches found
No related tags found
No related merge requests found
......@@ -96,9 +96,6 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const
{
QtVersion *v = QtVersionManager::instance()->version(m_qtVersionId);
const QString maddeRoot = MaemoGlobal::maddeRoot(v);
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(MaemoGlobal::targetRoot(v))));
// put this into environment to make pkg-config stuff work
env.prependOrSet(QLatin1String("SYSROOT_DIR"), QDir::toNativeSeparators(sysroot()));
......@@ -109,6 +106,10 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) const
env.prependOrSet(QLatin1String("PERL5LIB"),
QDir::toNativeSeparators(QString("%1/madlib/perl5").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin").arg(maddeRoot)));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(MaemoGlobal::targetRoot(v))));
const QString manglePathsKey = QLatin1String("GCCWRAPPER_PATHMANGLE");
if (!env.hasKey(manglePathsKey)) {
const QStringList pathsToMangle = QStringList() << QLatin1String("/lib")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment