diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-12 14:02:10 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-20 13:58:54 +0000 |
commit | a3d6e9d3965ae4d4f97986982b851ef30d091fd5 (patch) | |
tree | 1d77f21c2b40c7115939e30343ec74832ffd3765 /bin/qt5_tool | |
parent | 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 (diff) | |
download | qtrepotools-a3d6e9d3965ae4d4f97986982b851ef30d091fd5.tar.gz |
qt5_tool: Fix bootstrapping on new machines
Change df3090cb05817277b0dd3586e9e2e7a673955a24 (adding incredibuild)
broke bootstrapping on new machines since it tries to read the config
file in checkMake(). Add a check for existence of the config file.
Change-Id: I08bd2b0a56f50a8f5f61c3c73c2714719bc97ab0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'bin/qt5_tool')
-rwxr-xr-x | bin/qt5_tool | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool index 6d05ddf..07fe253 100755 --- a/bin/qt5_tool +++ b/bin/qt5_tool @@ -158,8 +158,12 @@ my $minGW = 0; sub checkMake { - my $useIncredibuild = readQt5ToolConfigBool('incredibuild') || defined($optIncredibuild); - my $jobs = readQt5ToolConfigInt('jobs', -1); + my $useIncredibuild = undef; + my $jobs = -1; + if (defined($configFile) && -f $configFile) { + $useIncredibuild = readQt5ToolConfigBool('incredibuild') || defined($optIncredibuild); + $jobs = readQt5ToolConfigInt('jobs', -1); + } if ($os == $OS_WINDOWS) { if (which('g++')) { $make = 'mingw32-make'; |