summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-12-15 09:35:39 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-15 04:24:39 +0100
commitca77c7147179fbd7808bab45f8fbccf72a708ced (patch)
treefbaddfc3cac62d404f48e194ee9d16d2d68db064 /configure
parentf9ab9cfba017ecaa4bc683a5b4d4ec18ef981f4a (diff)
Fixed configure exiting with 0 exit code even on failure.
The return value from system() is an exit status (e.g. returned value from waitpid) and needs to be shifted right by 8 bits to get an exit code. Change-Id: Ibbcc58491b27ef6d9d299427aeb78f57b41c92e2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 124248c7..8518d1d0 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ if (-e ".qmake.cache") {
unlink ".qmake.cache";
}
my $ret = system_v("$relpath/qtbase/configure @ARGV");
-exit $ret unless ($ret == 0);
+exit ($ret>>8) 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 probably because
@@ -71,4 +71,4 @@ print QMAKE_CACHE "include(\$\$PWD/qtbase/.qmake.cache)\n";
close QMAKE_CACHE;
$ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro");
-exit $ret;
+exit ($ret>>8);