Hide the output of make in qmake's dir inside configure
Unless the -v option is passed Change-Id: I16b2e6a42ccfc8d913517621f8f2e3bbcf9c4635 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>bb10
parent
1eb7005850
commit
9287f17db5
|
|
@ -3885,7 +3885,22 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
|
|||
fi
|
||||
done
|
||||
|
||||
(cd "$outpath/qmake"; "$MAKE") || exit 2
|
||||
if [ "$OPT_VERBOSE" = yes ]; then
|
||||
# Show the output of make
|
||||
(cd "$outpath/qmake"; "$MAKE") || exit 2
|
||||
else
|
||||
# Hide the output of make
|
||||
# Use bash to print dots, if we have it
|
||||
if $WHICH bash > /dev/null 2>/dev/null; then
|
||||
bash -c 'set -o pipefail
|
||||
cd "$0/qmake"; "$1" | while read line; do
|
||||
builtin echo -n .
|
||||
done' "$outpath" "$MAKE" || exit 2
|
||||
else
|
||||
(cd "$outpath/qmake"; "$MAKE" -s) || exit 2
|
||||
fi
|
||||
echo "Done."
|
||||
fi
|
||||
fi # Build qmake
|
||||
|
||||
echo "Running configuration tests..."
|
||||
|
|
|
|||
Loading…
Reference in New Issue