diff options
| author | Romain Pokrzywka <romain.pokrzywka@kdab.com> | 2012-09-26 05:33:15 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-30 00:02:06 +0200 |
| commit | 858ede74e21ef20af4b2b95ec31e6deb18254ad9 (patch) | |
| tree | 8a1c477199c1c330dfeafa70cf3a8e76dcea8e49 | |
| parent | d65dbb5d508d4cdbc383686428430035c205b21c (diff) | |
Pass --sysroot to endian.test when testing the target endianness
Change-Id: Ib7b68401e683b20dea42b7cf597784a13a995984
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rwxr-xr-x | config.tests/unix/endian.test | 3 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test index d0fb6ce785..9a7a2e1db7 100755 --- a/config.tests/unix/endian.test +++ b/config.tests/unix/endian.test @@ -4,13 +4,14 @@ QMKSPEC=$1 VERBOSE=$2 SRCDIR=$3 OUTDIR=$4 +SYSROOT=$5 # debuggery [ "$VERBOSE" = "yes" ] && echo "Determining machine byte-order... ($*)" # build and run a test program test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QMAKE_CXXFLAGS*=$SYSROOT" "LIBS*=$SYSROOT" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/endian" @@ -6629,7 +6629,7 @@ if [ "$CFG_ENDIAN" = "auto" ]; then elif [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then true #leave as auto else - "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" + "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$SYSROOT_FLAG" F="$?" if [ "$F" -eq 0 ]; then CFG_ENDIAN="Q_LITTLE_ENDIAN" |