From c8035e6afde9e92f968e690aee3365a887b110c7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Mon, 19 Jun 2017 12:41:56 +0200
Subject: qt5_tool: Detect MinGW by checking for g++

Previously, the environment variable QMAKESPEC
was checked, which should no longer be set.

Change-Id: I1f9925fb2c468472dd1789289ada0727f1d3c441
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 bin/qt5_tool | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/qt5_tool b/bin/qt5_tool
index f4830a6..8766b8b 100755
--- a/bin/qt5_tool
+++ b/bin/qt5_tool
@@ -141,15 +141,13 @@ sub msysGitUtility
     return $utility;
 }
 
-my $qmakeSpec = $ENV{'QMAKESPEC'};
 my $make = 'make';
 my @makeArgs = ('-s');
 my $makeForceArg = '-k';
 my $minGW = 0;
 
 if ($os == $OS_WINDOWS) {
-    $minGW = defined($qmakeSpec) && index($qmakeSpec,'g++') > 0;
-    if ($minGW) {
+    if (which('g++')) {
         $make = 'mingw32-make';
     } else {
         @makeArgs = ('/s', '/l');
-- 
cgit v1.2.3