Commit 380d2025 authored by Tobias Hunger's avatar Tobias Hunger

Symbian: RVCT and GCCE environment variables

Fix the RVCT/GCCE environment variables that need to be
set for SBSv2.

Change-Id: I4a0c6dec1ba92b420aab927985853071bffd6642
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
parent 0719e1e3
......@@ -117,8 +117,7 @@ void GcceToolChain::addToEnvironment(Utils::Environment &env) const
env.set(QLatin1String("QT_GCCE_VERSION"), m_gcceVersion);
QString version = m_gcceVersion;
env.set(QString::fromLatin1("SBS_GCCE") + version.remove(QLatin1Char('.'))
+ QLatin1String("BIN"),
compilerCommand().toUserOutput());
+ QLatin1String("BIN"), QDir::toNativeSeparators(compilerCommand().toFileInfo().absolutePath()));
// Required for SBS, which checks the version output from its tools
// and gets confused by localized output.
env.set(QLatin1String("LANG"), QString(QLatin1Char('C')));
......
......@@ -215,11 +215,12 @@ void RvctToolChain::addToEnvironment(Utils::Environment &env) const
env.set(QLatin1String("QT_RVCT_VERSION"), QString::fromLatin1("%1.%2")
.arg(m_version.majorVersion).arg(m_version.minorVersion));
env.set(varName(QLatin1String("BIN")), m_compilerCommand.toUserOutput());
const QString cxxPath = compilerCommand().toFileInfo().absolutePath();
env.set(varName(QLatin1String("BIN")), QDir::toNativeSeparators(cxxPath));
// Add rvct to path and set locale to 'C'
if (!m_compilerCommand.isEmpty())
env.prependOrSetPath(m_compilerCommand.toString());
env.prependOrSetPath(cxxPath);
env.set(QLatin1String("LANG"), QString(QLatin1Char('C')));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment