From 3bd29d1f0af0c26189de7208582a23bfb9582e3c Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 15 Feb 2012 13:49:55 +0100 Subject: Clean up default arch setting on Mac OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove config.tests/mac/defaultarch.test, but do the same type of default arch detection, only using the qmake binary instead of compiling an empty file. Qt 5 will only support 10.6 and up, which means we only support i386 and x86_64 now. Change-Id: I24949ac803b965c523b1ee45cf769e266dcde134 Reviewed-by: Morten Johan Sørvig --- config.tests/mac/defaultarch.test | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100755 config.tests/mac/defaultarch.test (limited to 'config.tests') diff --git a/config.tests/mac/defaultarch.test b/config.tests/mac/defaultarch.test deleted file mode 100755 index 80f244a8bb..0000000000 --- a/config.tests/mac/defaultarch.test +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -COMPILER=$1 -VERBOSE=$2 -WORKDIR=$3 -QT_MAC_DEFAULT_ARCH= - -touch defaultarch.c - -# compile something and run 'file' on it. -if "$COMPILER" -c defaultarch.c 2>/dev/null 1>&2; then - FIlE_OUTPUT=`file defaultarch.o` - [ "$VERBOSE" = "yes" ] && echo "'file' reports compiler ($COMPILER) default architechture as: $FIlE_OUTPUT" - -fi -rm -f defaultarch.c defaultarch.o - -# detect our known archs. -if echo "$FIlE_OUTPUT" | grep '\' > /dev/null 2>&1; then - QT_MAC_DEFAULT_ARCH=x86 # configure knows it as "x86" not "i386" -fi -if echo "$FIlE_OUTPUT" | grep '\' > /dev/null 2>&1; then - QT_MAC_DEFAULT_ARCH=x86_64 -fi -if echo "$FIlE_OUTPUT" | grep '\' > /dev/null 2>&1; then - QT_MAC_DEFAULT_ARCH=ppc -fi -if echo "$FIlE_OUTPUT" | grep '\' > /dev/null 2>&1; then - QT_MAC_DEFAULT_ARCH=ppc64 -fi - -[ "$VERBOSE" = "yes" ] && echo "setting QT_MAC_DEFAULT_ARCH to \"$QT_MAC_DEFAULT_ARCH\"" -export QT_MAC_DEFAULT_ARCH -- cgit v1.2.3