From af7a0ee55fd511652e3fe59fd62865aaf2a536a2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 13 Sep 2012 23:46:41 +0200 Subject: config.tests/arch: make distclean on the test, not qt Additionally, qmake no longer needs -o since we are in the project directory. Change-Id: I89dbe829c064663b653e8f747f0849d63ceb367e Reviewed-by: Oswald Buddenhagen --- config.tests/unix/arch.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.tests/unix/arch.test b/config.tests/unix/arch.test index 9e18597dd3..dacdcda8bf 100755 --- a/config.tests/unix/arch.test +++ b/config.tests/unix/arch.test @@ -30,9 +30,9 @@ done # build a test program but don't run it test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch" -[ -f Makefile ] && $MAKE distclean >/dev/null 2>&1 -OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch.pro" -o "$OUTDIR/config.tests/arch/Makefile" >/dev/null 2>&1 || echo "qmake is broken" >&2 cd "$OUTDIR/config.tests/arch" +[ -f Makefile ] && $MAKE distclean >/dev/null 2>&1 +OUTDIR=$OUTDIR "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "LIBS+=$LFLAGS" "QMAKE_CXXFLAGS+=$CXXFLAGS" "$SRCDIR/config.tests/arch/arch.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2 ARCH="" -- cgit v1.2.3