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

ProjectExplorer: Do not set up a 64-bit mingw as a 32-bit toolchain

Browse Source 
The mingw toolchain is typically shipped explicitly as a 32-bit or 64-
bit package, alongside matching libraries. Therefore, it makes little
sense to set up a 64-bit mingw compiler as a 32-bit toolchain, even
though it can create 32-bit objects.

Task-number: QTCREATORBUG-22160
Change-Id: I9437801741b146785fecb0c0dd4b1db21ef94918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2019-04-02 13:49:34 +02:00
parent 000273b3f8
commit 9d5e38dbbb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,8 @@ static QList<Abi> guessGccAbi(const QString &m, const ProjectExplorer::Macros &m
abiList << Abi(arch, os, flavor, format, width == 64 ? 32 : 64);
} else if (arch == Abi::X86Architecture && (width == 0 || width == 64)) {
abiList << Abi(arch, os, flavor, format, 64);
abiList << Abi(arch, os, flavor, format, 32);
if (width != 64 || !m.contains("mingw"))
abiList << Abi(arch, os, flavor, format, 32);
} else {
abiList << Abi(arch, os, flavor, format, width);
}