summaryrefslogtreecommitdiff
path: root/src/app/qbs-setup-toolchains
diff options
context:
space:
mode:
authorAlberto Mardegan <mardy@users.sourceforge.net>2020-04-12 10:11:47 +0300
committerAlberto Mardegan <mardy@users.sourceforge.net>2020-04-15 16:07:54 +0000
commit846fc574f38395af24a9e60726372cb56075cff4 (patch)
tree51cbad18794986afd53b06fa4cda4da45f7aaad9 /src/app/qbs-setup-toolchains
parent8ceb1028659f9f5f921195192cafef9791f29682 (diff)
downloadqbs-846fc574f38395af24a9e60726372cb56075cff4.tar.gz
GCC: fix detection of Mingw prefix in MXE
The toolchain paths in MXE are of the form $MXE_PATH/usr/bin/x86_64-w64-mingw32.shared-g++ so we should not assume that what follows the dot is an extension that needs to be stripped (like QFileInfo::completeBaseName() does). Instead, only strip the know executable extensions. Change-Id: I51040d65e372ef3152ddd9229dd33011661c2b46 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'src/app/qbs-setup-toolchains')
-rw-r--r--src/app/qbs-setup-toolchains/gccprobe.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/qbs-setup-toolchains/gccprobe.cpp b/src/app/qbs-setup-toolchains/gccprobe.cpp
index df3f92f62..6cbe246a5 100644
--- a/src/app/qbs-setup-toolchains/gccprobe.cpp
+++ b/src/app/qbs-setup-toolchains/gccprobe.cpp
@@ -111,7 +111,7 @@ class ToolchainDetails
public:
explicit ToolchainDetails(const QFileInfo &compiler)
{
- auto baseName = compiler.completeBaseName();
+ auto baseName = HostOsInfo::stripExecutableSuffix(compiler.fileName());
// Extract the version sub-string if it exists. We assume that a version
// sub-string located after the compiler prefix && suffix. E.g. this code
// parses a version from the compiler names, like this: