From 19e61ac2907fd453d629d270668139cd1da7e10b Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 19 Aug 2015 13:21:35 +0200 Subject: Fix pointer size detection when cross-compiling The initial configure fails to build the pointer size test correctly due to the missing --sysroot argument. This breaks 64-bit targets as the pointer size is set to 4. A subsequent configure correctly builds and picks 8 up, but we expect the first attempt to work as well. Task-number: QTBUG-47840 Change-Id: Iaf9450635f1bbc12e18062fa0a51f35cf690ce08 Reviewed-by: Oswald Buddenhagen --- config.tests/unix/ptrsize.test | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config.tests') diff --git a/config.tests/unix/ptrsize.test b/config.tests/unix/ptrsize.test index 4f42c6d11d..7d7bde57e5 100755 --- a/config.tests/unix/ptrsize.test +++ b/config.tests/unix/ptrsize.test @@ -5,12 +5,15 @@ VERBOSE=$2 SRCDIR=$3 OUTDIR=$4 +LFLAGS=$SYSROOT_FLAG +CXXFLAGS=$SYSROOT_FLAG + # debuggery [ "$VERBOSE" = "yes" ] && echo "Testing size of pointers ... ($*)" # build and run a test program test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG-=app_bundle" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 +"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG-=app_bundle" "QMAKE_LFLAGS*=$LFLAGS" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 cd "$OUTDIR/config.tests/unix/ptrsize" if [ "$VERBOSE" = "yes" ]; then -- cgit v1.2.3