mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
fix argument quoting when invoking "proper" configure
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
committed by
The Qt Project
parent
2ad41f3ba7
commit
b9b8db0745
8
configure
vendored
8
configure
vendored
@@ -73,9 +73,7 @@ sub ensureDir {
|
||||
# `system', but also print the command
|
||||
sub system_v
|
||||
{
|
||||
print "+ ";
|
||||
print @_;
|
||||
print "\n";
|
||||
print "+ @_\n";
|
||||
return system(@_);
|
||||
}
|
||||
|
||||
@@ -90,7 +88,7 @@ if (! -e "$relpath/qtbase/configure") {
|
||||
|
||||
ensureDir("$outpath/qtbase");
|
||||
chdir("$outpath/qtbase");
|
||||
my $ret = system_v("$relpath/qtbase/configure @ARGV");
|
||||
my $ret = system_v("$relpath/qtbase/configure", @ARGV);
|
||||
if ($ret != 0) {
|
||||
print "*** qtbase/configure exited with non-zero status.\n";
|
||||
exit ($ret>>8) ;
|
||||
@@ -98,5 +96,5 @@ if ($ret != 0) {
|
||||
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user