diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-19 12:41:56 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-20 12:31:21 +0000 |
| commit | c8035e6afde9e92f968e690aee3365a887b110c7 (patch) | |
| tree | 0b5e704de67a7992efce1fd60e41f9e42292e0db /bin | |
| parent | b5357f68bce6b1f3554745c03295fcc6c47a7e5f (diff) | |
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>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/qt5_tool | 4 |
1 files changed, 1 insertions, 3 deletions
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'); |