71b4325cb7
Instead of setting -isysroot in both arch.test, compile.test, the various mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf. The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected to be of the short-form name, eg macosx or iphoneos, not a full path, as that's what Xcode also expects. We take care of translating that into a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as a helper. Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
56 lines
1.4 KiB
Bash
Executable File
56 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
QMKSPEC=$1
|
|
VERBOSE=$2
|
|
SRCDIR=$3
|
|
OUTDIR=$4
|
|
RESULTFILE=$5
|
|
TARGET=$6
|
|
shift 6
|
|
|
|
if [ "$TARGET" = "host" ]; then
|
|
VARPREFIX="CFG_HOST"
|
|
PROSUFFIX="_host"
|
|
else
|
|
VARPREFIX="CFG"
|
|
PROSUFFIX=""
|
|
fi
|
|
|
|
LFLAGS="$SYSROOT_FLAG"
|
|
CXXFLAGS="$SYSROOT_FLAG"
|
|
|
|
# debuggery
|
|
[ "$VERBOSE" = "yes" ] && echo "Determining architecture... ($*)"
|
|
|
|
# build a test program but don't run it
|
|
test -d "$OUTDIR/config.tests/arch" || mkdir -p "$OUTDIR/config.tests/arch"
|
|
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$PROSUFFIX.pro" >/dev/null 2>&1 || echo "qmake is broken" >&2
|
|
|
|
|
|
ARCH=""
|
|
[ "$VERBOSE" = "yes" ] && $MAKE || $MAKE >/dev/null 2>&1
|
|
|
|
if [ -f ./arch.exe ]; then
|
|
binary=./arch.exe
|
|
elif [ -f ./arch ]; then
|
|
binary=./arch
|
|
else
|
|
[ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!"
|
|
exit 2
|
|
fi
|
|
|
|
if strings - $binary 2>/dev/null | \
|
|
awk -F: '/==Qt=magic=Qt== Architecture/ { print "'$VARPREFIX'_ARCH=\"" $2 "\"" }
|
|
/==Qt=magic=Qt== Sub-architecture/ { print "'$VARPREFIX'_CPUFEATURES=\"" $2 "\"" }' > "$RESULTFILE"
|
|
then
|
|
[ "$VERBOSE" = "yes" ] && echo " Found architecture in binary" && \
|
|
cat "$RESULTFILE"
|
|
else
|
|
[ "$VERBOSE" = "yes" ] && echo "Unable to determine architecture!"
|
|
exit 2
|
|
fi
|
|
|
|
$MAKE distclean >/dev/null 2>&1
|