summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2011-10-06 10:17:47 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-07 02:29:16 +0200
commit6bd52260c811d7ad9eb74bde0db02f178bd40b47 (patch)
tree7f21abe438c5d995e98ce843efbaeb846a4b8266 /configure
parent59621329f1b5bf6e4edfd070d2b879d8bcb8aa3a (diff)
Check for a non-error, non-continue case.
There is at least one case in configure where it exist with a code of 0 but does not create .qmake.cache. Detect this and avoid continuing. Change-Id: I0554991e5d4a50b7072494c080fa2c593e03b726 Reviewed-on: http://codereview.qt-project.org/6094 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 10 insertions, 0 deletions
diff --git a/configure b/configure
index 0c3a2685..40152add 100755
--- a/configure
+++ b/configure
@@ -51,8 +51,18 @@ if (! -e "$relpath/qtbase/configure") {
ensureDir("$outpath/qtbase");
chdir("$outpath/qtbase");
+if (-e ".qmake.cache") {
+ # Remove this so we can detect if configure finished properly
+ unlink ".qmake.cache";
+}
my $ret = system_v("$relpath/qtbase/configure @ARGV");
exit $ret unless ($ret == 0);
+if (! -e ".qmake.cache") {
+ # Even though there was no error code, this file wasn't created
+ # so configure didn't finish properly. This is probaby because
+ # the user passed -help
+ exit 0;
+}
chdir("$outpath");