lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-21 07:28:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed configure exiting with 0 exit code even on failure.

Browse Source 
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>
This commit is contained in:
Rohan McGovern
2011-12-15 09:35:39 +10:00
committed by Qt by Nokia
parent f9ab9cfba0
commit ca77c71471
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -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);