X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fconfig.guess;h=f75fb83cb78c33b2685005227eefe450fb0335d5;hb=ce92b8e46348974261f866bcdf1c7c917d9c3a6e;hp=516ac6c173c8b14ebd751b2e5d37498332640d72;hpb=9be0b54cb42e404e3e355c800b23537416acbc1f;p=gnulib.git

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 516ac6c17..f75fb83cb 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-05-16'
+timestamp='2013-11-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1260,16 +1260,26 @@ EOF
 	if test "$UNAME_PROCESSOR" = unknown ; then
 	    UNAME_PROCESSOR=powerpc
 	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		case $UNAME_PROCESSOR in
-		    i386) UNAME_PROCESSOR=x86_64 ;;
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
-	    fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+    	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+    		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+    		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+    		    grep IS_64BIT_ARCH >/dev/null
+    		then
+    		    case $UNAME_PROCESSOR in
+    			i386) UNAME_PROCESSOR=x86_64 ;;
+    			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+    		    esac
+    		fi
+    	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+            # Avoid executing cc on OS X 10.9, as it ships with a stub
+            # that puts up a graphical alert prompting to install
+            # developer tools.  Any system running Mac OS X 10.7 or
+            # later (Darwin 11 and later) is required to have a 64-bit
+            # processor. This is not true of the ARM version of Darwin
+            # that Apple uses in portable devices.
+            UNAME_PROCESSOR=x86_64
 	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;