Skip to content

Commit

Permalink
fix argument quoting when invoking "proper" configure
Browse files Browse the repository at this point in the history
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <[email protected]>
  • Loading branch information
ossilator authored and The Qt Project committed Nov 14, 2012
1 parent 2ad41f3 commit b9b8db0
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ sub ensureDir {
# `system', but also print the command
sub system_v
{
print "+ ";
print @_;
print "\n";
print "+ @_\n";
return system(@_);
}

Expand All @@ -90,13 +88,13 @@ 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) ;
}

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

0 comments on commit b9b8db0

Please sign in to comment.