summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2012-09-23 14:51:37 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-28 18:19:12 +0200
commit600b295f2cbca611792b6797a335c0b6eb009a02 (patch)
tree4fa55b49f6baa1d797767d34fd192efbce6466ed /configure
parent58acd59fa661739b4bd3a39d85841f7bea61caa8 (diff)
Revert "Check for a non-error, non-continue case."
This reverts commit 6bd52260c811d7ad9eb74bde0db02f178bd40b47. Running configure -help should not break builds by removing .qmake.cache. Change-Id: I9754ea891a445a9b67a1f9ad0adac85cb36338fe Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 0 insertions, 10 deletions
diff --git a/configure b/configure
index 044e062d..23dc503e 100755
--- a/configure
+++ b/configure
@@ -90,21 +90,11 @@ 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");
if ($ret != 0) {
print "*** qtbase/configure exited with non-zero status.\n";
exit ($ret>>8) ;
}
-if (! -e ".qmake.cache") {
- # Even though there was no error code, this file wasn't created
- # so configure didn't finish properly. This is probably because
- # the user passed -help
- exit 0;
-}
chdir("$outpath");