From 5c7c3a410df005c9da732990a220ebb4aa067452 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Tue, 18 Oct 2022 17:00:36 +0200 Subject: [PATCH] ProjectExplorer: Use device env when inspecting gcc 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 --- src/plugins/projectexplorer/gcctoolchain.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index bdce4800105..41ec7c6b92b 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -445,7 +445,7 @@ static QStringList filteredFlags(const QStringList &allFlags, bool considerSysro ToolChain::MacroInspectionRunner GccToolChain::createMacroInspectionRunner() const { // Using a clean environment breaks ccache/distcc/etc. - Environment env = Environment::systemEnvironment(); + Environment env = compilerCommand().deviceEnvironment(); addToEnvironment(env); const QStringList platformCodeGenFlags = m_platformCodeGenFlags; OptionsReinterpreter reinterpretOptions = m_optionsReinterpreter; @@ -852,7 +852,7 @@ void GccToolChain::setOptionsReinterpreter(const OptionsReinterpreter &optionsRe GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const { - Environment env = Environment::systemEnvironment(); + Environment env = compilerCommand().deviceEnvironment(); addToEnvironment(env); ProjectExplorer::Macros macros = createMacroInspectionRunner()({}).macros; return guessGccAbi(findLocalCompiler(compilerCommand(), env), @@ -863,7 +863,7 @@ GccToolChain::DetectedAbisResult GccToolChain::detectSupportedAbis() const QString GccToolChain::detectVersion() const { - Environment env = Environment::systemEnvironment(); + Environment env = compilerCommand().deviceEnvironment(); addToEnvironment(env); return gccVersion(findLocalCompiler(compilerCommand(), env), env, filteredFlags(platformCodeGenFlags(), true)); @@ -871,7 +871,7 @@ QString GccToolChain::detectVersion() const Utils::FilePath GccToolChain::detectInstallDir() const { - Environment env = Environment::systemEnvironment(); + Environment env = compilerCommand().deviceEnvironment(); addToEnvironment(env); return gccInstallDir(findLocalCompiler(compilerCommand(), env), env, filteredFlags(platformCodeGenFlags(), true));