lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-18 02:56:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix argument quoting when invoking "proper" configure

Browse Source 
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen
2012-11-08 14:56:39 +01:00
committed by The Qt Project
parent 2ad41f3ba7
commit b9b8db0745
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@@ -73,9 +73,7 @@ sub ensureDir {
# `system', but also print the command # `system', but also print the command
sub system_v sub system_v
{ {
print "+ "; print "+ @_\n";
print @_;
print "\n";
return system(@_); return system(@_);
} }
@@ -90,7 +88,7 @@ if (! -e "$relpath/qtbase/configure") {
ensureDir("$outpath/qtbase"); ensureDir("$outpath/qtbase");
chdir("$outpath/qtbase"); chdir("$outpath/qtbase");
my $ret = system_v("$relpath/qtbase/configure @ARGV"); my $ret = system_v("$relpath/qtbase/configure", @ARGV);
if ($ret != 0) { if ($ret != 0) {
print "*** qtbase/configure exited with non-zero status.\n"; print "*** qtbase/configure exited with non-zero status.\n";
exit ($ret>>8) ; exit ($ret>>8) ;
@@ -98,5 +96,5 @@ if ($ret != 0) {
chdir("$outpath"); chdir("$outpath");
$ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro"); $ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro");
exit ($ret>>8); exit ($ret>>8);