diff options
| author | Morten Johan Sorvig <morten.sorvig@nokia.com> | 2012-05-03 12:27:53 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 09:19:23 +0200 |
| commit | 2368809a282c252bcf97af51165aa27ef3add466 (patch) | |
| tree | d3d06a729a6e7cde63dea6061cc5f9b7cf57352e /configure | |
| parent | 976619bd598cb630d466aa32dbf4281bf1504bc0 (diff) | |
Remove "file qmake"-based arch detection.
Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 24 |
1 files changed, 0 insertions, 24 deletions
@@ -4958,30 +4958,6 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then QT_CONFIG="$QT_CONFIG dwarf2" fi -# Detect the default arch (x86 or x86_64) on Mac OS X -if [ "$BUILD_ON_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; then - DEFAULT_ARCH= - case `file "${outpath}/bin/qmake"` in - *i?86) - DEFAULT_ARCH=x86 - ;; - *x86_64) - DEFAULT_ARCH=x86_64 - ;; - *ppc|*ppc64|*) - # unsupported/unknown - ;; - esac - - if [ -n "$DEFAULT_ARCH" ]; then - [ "$OPT_VERBOSE" = "yes" ] && echo "Setting default Mac OS X architechture to $DEFAULT_ARCH." - QT_CONFIG="$QT_CONFIG $DEFAULT_ARCH" - QMAKE_CONFIG="$QMAKE_CONFIG $DEFAULT_ARCH" - # Make the application arch follow the Qt arch - QTCONFIG_CONFIG="$QTCONFIG_CONFIG $DEFAULT_ARCH" - fi -fi - # ### Vestige if [ "$CFG_PHONON_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG phonon-backend" |