From 8bb60d62000ad549dfc65e9acc0ec7fcba667815 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 22 Mar 2009 16:46:45 +0000
Subject: Reverted vinterstum's 'unification' of iPhone and Mac OS X configure
 code. There is no reliable way to distinguish iPhone OS X and 'regular' Mac
 OS X via the host type only

svn-id: r39610
---
 configure | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index bae1e9fa34..bd3244c678 100755
--- a/configure
+++ b/configure
@@ -761,6 +761,10 @@ i586-mingw32msvc)
 	_host_os=mingw32msvc
 	_host_cpu=i586
 	;;
+iphone)
+	_host_os=iphone
+	_host_cpu=arm
+	;;
 neuros)
 	_host_os=linux
 	_host_cpu=arm
@@ -1134,7 +1138,7 @@ if test -n "$_host"; then
 		bfin*)
 			_need_memalign=yes
 			;;
-		i686-apple-darwin*|ppc-apple-darwin*)
+		*darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
@@ -1197,7 +1201,7 @@ if test -n "$_host"; then
 			_ar="$_host-ar cru"
 			_ranlib=$_host-ranlib
 			;;
-		arm-apple-darwin*)
+		iphone)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
 			DEFINES="$DEFINES -DIPHONE -DUNIX -DUSE_ARM_SMUSH_ASM"
 			_endian=little
@@ -1209,8 +1213,6 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			_backend="iphone"
 			_build_hq_scalers="no"
-			_ranlib=$_host-ranlib
-			_strip=$_host-strip
 			;;
 		dreamcast)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
-- 
cgit v1.2.3