From c954bf8b91bb0e7bc7ce4eb8cecca1331766b051 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 13 Feb 2012 11:55:39 +0100 Subject: Fix host endian detection when compiling with sysroot Apply the sysroot argument for the endian test only for the test used for detecting the target endianness, don't use --sysroot for the host detection. Change-Id: I53edda6ebfd06e73cc64f2561b707bd2ba052ae7 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- config.tests/unix/endian.test | 3 ++- configure | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config.tests/unix/endian.test b/config.tests/unix/endian.test index 2985fd8241..6c5c311888 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 +QMFLAGS=$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" "QMAKE_LFLAGS+=$SYSROOT_FLAG" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "QT_BUILD_TREE=$OUTDIR" $QMFLAGS "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/endian" diff --git a/configure b/configure index d497c2f77c..bfbb5c7768 100755 --- a/configure +++ b/configure @@ -5979,7 +5979,7 @@ if [ "$CFG_ENDIAN" = "auto" ]; then elif [ "$PLATFORM_MAC" = "yes" ]; then true #leave as auto else - "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" + "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "QMAKE_LFLAGS+=$SYSROOT_FLAG" F="$?" if [ "$F" -eq 0 ]; then CFG_ENDIAN="Q_LITTLE_ENDIAN" -- cgit v1.2.3