feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Use device env when inspecting gcc

Browse Source 
Previously the host environment would be used while inspecting
a gcc / g++ compiler. When doing so on a Windows Host
against a Docker target, this would fail.

Change-Id: I0e7b392101cee23e17813fa07f6c04bb9d3999c9
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-18 17:00:36 +02:00
committed by hjk
parent f7a2132598
commit 5c7c3a410d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -445,7 +445,7 @@ static QStringList filteredFlags(const QStringList &allFlags, bool considerSysro
ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() const ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() const
{ {
// Using a clean environment breaks ccache/distcc/etc. // Using a clean environment breaks ccache/distcc/etc.
Environment env = Environment::systemEnvironment(); Environment env = compilerCommand().deviceEnvironment();
addToEnvironment(env); addToEnvironment(env);
const QStringList platformCodeGenFlags = m_platformCodeGenFlags; const QStringList platformCodeGenFlags = m_platformCodeGenFlags;
OptionsReinterpreter reinterpretOptions = m_optionsReinterpreter; OptionsReinterpreter reinterpretOptions = m_optionsReinterpreter;
@@ -852,7 +852,7 @@ void GccToolChain::setOptionsReinterpreter(const OptionsReinterpreter &optionsRe
GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const
{ {
Environment env = Environment::systemEnvironment(); Environment env = compilerCommand().deviceEnvironment();
addToEnvironment(env); addToEnvironment(env);
ProjectExplorer::Macros macros = createMacroInspectionRunner()({}).macros; ProjectExplorer::Macros macros = createMacroInspectionRunner()({}).macros;
return guessGccAbi(findLocalCompiler(compilerCommand(), env), return guessGccAbi(findLocalCompiler(compilerCommand(), env),
@@ -863,7 +863,7 @@ GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const
QString GccToolChain::detectVersion() const QString GccToolChain::detectVersion() const
{ {
Environment env = Environment::systemEnvironment(); Environment env = compilerCommand().deviceEnvironment();
addToEnvironment(env); addToEnvironment(env);
return gccVersion(findLocalCompiler(compilerCommand(), env), env, return gccVersion(findLocalCompiler(compilerCommand(), env), env,
filteredFlags(platformCodeGenFlags(), true)); filteredFlags(platformCodeGenFlags(), true));
@@ -871,7 +871,7 @@ QString GccToolChain::detectVersion() const
Utils::FilePath GccToolChain::detectInstallDir() const Utils::FilePath GccToolChain::detectInstallDir() const
{ {
Environment env = Environment::systemEnvironment(); Environment env = compilerCommand().deviceEnvironment();
addToEnvironment(env); addToEnvironment(env);
return gccInstallDir(findLocalCompiler(compilerCommand(), env), env, return gccInstallDir(findLocalCompiler(compilerCommand(), env), env,
filteredFlags(platformCodeGenFlags(), true)); filteredFlags(platformCodeGenFlags(), true));